678 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
Thibaut Girka	5d647197ec	Add bookmarks to archive takeout	7 years ago
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	7 years ago
Eugen Rochko	cabdbb7f9c	Add CLI task for rotating keys (#8466) ... * If an Update is signed with known key, skip re-following procedure Because it means the remote actor did *not* lose their database * Add CLI method for rotating keys bin/tootctl accounts rotate [USERNAME] Generates a new RSA key per account and sends out an Update activity signed with the old key. * Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts * Skip suspended accounts in key rotation	7 years ago
Eugen Rochko	8adf485c0f	Bump interactions count when a follow happens (#8468)	7 years ago
Thibaut Girka	be20eb4b2f	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	55c856c522	Delay e-mail notifications by 2 minutes (#8438) ... Fix #8430	7 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	7 years ago
ThibG	42573b76f1	Do not crash if remote custom emoji does not define updated date (fixes #8376) (#8377)	7 years ago
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	802cf6a4c5	Improve federated ID validation (#8372) ... * Fix URI not being sufficiently validated with prefetched JSON * Add additional id validation to OStatus documents, when possible	7 years ago
Eugen Rochko	1b282299df	Add favourites to archive takeout (#8351) ... Remove experimental key export	7 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	7 years ago
Eugen Rochko	d98de8ada7	Get rid of all batch order warnings (#8334)	7 years ago
Eugen Rochko	6226aa83d7	Increase reach of Delete->Actor activities (#8305) ... Fix #7316	7 years ago
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	abc5548cca	Do not process outgoing mentions to suspended accounts (#8272)	7 years ago
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	7 years ago
ThibG	1ee675d68b	Use correct activity id in Accept when receiving duplicate Follow (fixes #8218) (#8244)	7 years ago
ThibG	af912fb308	Allow accessing local private/DM messages by URL (#8196) ... * Allow accessing local private/DM messages by URL (Provided the user pasting the URL is authorized to see the toot, obviously) * Fix SearchServiceSpec tests	7 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	7 years ago
Eugen Rochko	cc94b1d95a	Prevent ActivityPub movedTo recursion (#8092) ... Fix #8051	7 years ago
Thibaut Girka	7dbed4dab9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	a23ac107e4	Fix activity:interactions counter to count all interactions (#8037)	7 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	7 years ago
Eugen Rochko	e55dce3176	Add federation relay support (#7998) ... * Add federation relay support * Add admin UI for managing relays * Include actor on relay-related activities * Fix i18n	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
Eugen Rochko	8461cd4bb5	Send undo of boost to original poster if reblog (#7959) ... Fix #7874	7 years ago
Eugen Rochko	b0968623fa	Fix check for PotentialFriendshipTracker when replying (#7933)	7 years ago
Eugen Rochko	da8fe8079e	Re-add follow recommendations API (#7918) ... * Re-add follow recommendations API GET /api/v1/suggestions Removed in 8efa081f21 due to Neo4J dependency. The algorithm uses triadic closures, takes into account suspensions, blocks, mutes, domain blocks, excludes locked and moved accounts, and prefers more recently updated accounts. * Track interactions with people you don't follow Replying to, favouriting and reblogging someone you're not following will make them show up in follow recommendations. The interactions have different weights: - Replying is 1 - Favouriting is 10 (decidedly positive interaction, but private) - Reblogging is 20 Following them, muting or blocking will remove them from the list, obviously. * Remove triadic closures, ensure potential friendships are trimmed	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828) ... * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	7 years ago
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	7 years ago
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	7 years ago
Eugen Rochko	c3b3594305	Remove placeholder text for media-only toots (#7806) ... Ref: cfa9b6e13a This breaks compatibility with pre-2.3.0 Mastodon and older software, but at the time of writing the network is >80% above that version. Compatibility broken only for toots with no text.	7 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	10f51c9886	Fix domain hiding logic (#7765) ... * Send rejections to followers when user hides domain they're on * Use account domain blocks for "authorized followers" action Replace soft-blocking (block & unblock) behaviour with follow rejection * Split sync and async work of account domain blocking Do not create domain block when removing followers by domain, that is probably unexpected from the user's perspective. * Adjust confirmation message for domain block * yarn manage:translations	7 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	7 years ago
Yamagishi Kazutoshi	e3fb528d12	Skip processing when HEAD method returns 501 (#7730)	7 years ago
Akihiko Odaki	5bf5003384	Do not mark remote status sensitive even if spoiler text is present (#7395) ... Old statuses and statuses from Pawoo, which runs a modified version of Mastodon, may not have been marked sensitive even if spoiler text is present. Such statuses are still not marked sensitve if they are local or arrived before version upgrade. Marking recently fetched remote status sensitive contradicts the behavior. Considering what people expected when they authored such statuses, this change removes the sensitivity enforcement.	7 years ago
David Yip	3550470c18	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.	7 years ago
Eugen Rochko	1e938b966e	Exclude unlisted, private and direct toots from affecting trends (#7686)	7 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	a7d726c383	Improve counter caches on Status and Account (#7644) ... Do not touch statuses_count on accounts table when mass-destroying statuses to reduce load when removing accounts, same for reblogs_count and favourites_count Do not count statuses with direct visibility in statuses_count Fix #828	7 years ago
Eugen Rochko	461542784b	Reduce wasted work in RemoveStatusService due to inactive followers (#7672)	7 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	9bd23dc4e5	Track trending tags (#7638) ... * Track trending tags - Half-life of 1 day - Historical usage in daily buckets (last 7 days stored) - GET /api/v1/trends Fix #271 * Add trends to web UI * Don't render compose form on search route, adjust search results header * Disqualify tag from trends if it's in disallowed hashtags setting * Count distinct accounts using tag, ignore silenced accounts	7 years ago
Thibaut Girka	a4c9bda771	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.	7 years ago
Eugen Rochko	32d4372381	Use #any? instead of #exists? when checking media attachments (#7570) ... If media_attachments are not loaded, SQL query is the same, but the #exists? method performs SQL query even if preloaded	7 years ago
Yamagishi Kazutoshi	7403e5d306	Add media timeline (#6631)	7 years ago
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	7 years ago