Commit Graph

2703 Commits (d3b8cd342ff6d1fe87bcfe6305424faf49666252)

Author SHA1 Message Date
rinpatch a53b917e7f oof
6 years ago
rinpatch ad681877df Make credo happy
6 years ago
rinpatch e641651e2b Fix unbookmarking
6 years ago
rinpatch b09ae02c04 Added some more normalization calls all in mastodon api controller
6 years ago
rinpatch 462028688b Fix pinned posts relying on embded objects
6 years ago
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction
6 years ago
Ivan Tashkinov 128aae05f3 [#923] Minor semantic adjustment.
6 years ago
kaniini 02a53d00c9 Merge branch 'fix/remote-follow-auth' into 'develop'
6 years ago
Haelwenn cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop'
6 years ago
Normandy d4a749cfb2 Handle new-style mastodon follow lists
6 years ago
William Pitcock 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
Hakurei Reimu 6e26ac10a3 make Pleroma.Endpoint use extra_cookie_attrs in config
6 years ago
lain 76999c73a7 Conversation: Add accounts to output.
6 years ago
lain 0da985182f Conversation: Return full status object, id is a string.
6 years ago
lambda 56956de6fa Merge branch 'fix/status-reblogged' into 'develop'
6 years ago
lambda f358295cbe Merge branch 'unfollow-oneself' into 'develop'
6 years ago
eugenijm 27d78dc526 Use User.get_cached_by*
6 years ago
rinpatch 5d73dca064 Remove inReplyToStatusId
6 years ago
eugenijm 507e7821e3 Handle follow/unfollow directed to themselves
6 years ago
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view
6 years ago
Egor f9af90c5aa Revert "simplify mentions escape"
6 years ago
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
6 years ago
lambda 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
6 years ago
lambda 57d5ff57d6 Merge branch 'fix/732-password-align' into 'develop'
6 years ago
Alexander Strizhakov 711ade961e adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov e03d24af96 in_reply_to_id - null
6 years ago
kaniini 31c06dba5a Merge branch 'fix/hackney_max_body_param' into 'develop'
6 years ago
Roman Chvanikov 4615e56219 Add `with_body: true` to requests relying on `max_body: val`
6 years ago
Egor Kislitsyn db4badc6aa move user disable into deactivation
6 years ago
Egor Kislitsyn 0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring.
6 years ago
lain c352a0aba6 Conversations: Make tests run.
6 years ago
lain 280172f6f6 Conversations: Create or bump on inserting a dm.
6 years ago
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
6 years ago
Sadposter be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lambda c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
Haelwenn (lanodan) Monnier cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
Haelwenn (lanodan) Monnier 1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
kaniini 0ab563d334 Merge branch 'hotfix/fix_undefined_summary' into 'develop'
6 years ago
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
6 years ago
rinpatch b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
Sadposter 589629cf3e
Used cached user resources in subscriptions
6 years ago
lain a9f805c871 Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
6 years ago
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop'
6 years ago
Alexander Strizhakov 36c0a10fdf adding language tag
6 years ago
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop'
6 years ago
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn a1a854646e Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
6 years ago
lambda b177e1e7f3 Merge branch 'scheduled-activities' into 'develop'
6 years ago
Alex S 012bb5dcc9 renaming expire_at -> expires_at
6 years ago
Sadposter 76fdfd1c7f Add check on activity visibility in sub notification
6 years ago
Alex S 56c75aec12 credo fix
6 years ago
Alex S b810aac117 added docs to docs/api/admin_api.md
6 years ago
Ivan Tashkinov e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
feld fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop'
6 years ago
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago
eugenijm b3870df51f Handle `scheduled_at` on status creation.
6 years ago
eugenijm 7bf622ce73 Add scheduled activities
6 years ago
eugenijm 7aa53d52bd Return 403 on oauth token exchange for a deactivated user
6 years ago
Sadposter c05fe4da0a
Document subscription endpoints, fix typos
6 years ago
feld 9aeac7dcca Merge branch 'feature/prometheus' into 'develop'
6 years ago
Alex S a53d591ac5 code style
6 years ago
Alex S 7410aee886 Merge develop to 770-add-emoji-tags
6 years ago
Alex S dcc54f8cfa admin api endpoints for invites
6 years ago
Alex S 47b07cec49 token -> invite renaming
6 years ago
Alex S be54e40890 twitter api registration
6 years ago
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization
6 years ago
Mark Felder b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api.
6 years ago
Sadposter 9ca91cbb87 Change relationship direction of subscriptions
6 years ago
Sadposter d35f6551c1 Move subscriptions endpoint to be under /pleroma
6 years ago
Sadposter d56866c824 Add subscribed status to user view
6 years ago
Sadposter 316fe20d86 Make subscriptions the same direction as blocks
6 years ago
Sadposter 23c4f49494 Fix subscription endpoint return formats
6 years ago
Sadposter 007762e767 Add notification checks
6 years ago
Sadposter 79910ce5cc Add API endpoints and user column for subscription
6 years ago
Egor Kislitsyn 1c2e4f88d1 fix credo
6 years ago
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
rinpatch f0f30019e1 Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
Ivan Tashkinov 47a236f753 [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov 3e7f2bfc2f [#923] OAuthController#callback adjustments (with tests).
6 years ago
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov f7cd9131d4 [#923] OAuth consumer controller tests. Misc. improvements.
6 years ago
href bc3618a38d Set up telemetry and prometheus
6 years ago
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Haelwenn (lanodan) Monnier af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
rinpatch 79cb34a4b0 Fix preview not being usable in form data
6 years ago
Haelwenn 0cb94cfa94 Merge branch 'fix-slow-relationships' into 'develop'
6 years ago
lambda 256b492a58 Merge branch 'bugfix/wrong-date-format' into 'develop'
6 years ago
lambda a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop'
6 years ago
lain 39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
lain fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
Alex S fa8483cb80 Merging develop into feature/770-add-emoji-tags
6 years ago
lambda 180b87257c Merge branch 'bugfix/share-mastodon' into 'develop'
6 years ago
lambda b95cf3d490 Merge branch 'get_by_id' into 'develop'
6 years ago
Alex S 9e0567ec52 Merge develop into feature/770-add-emoji-tags
6 years ago
rinpatch fdb4357e9b Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
Ivan Tashkinov 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
lambda 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
6 years ago
Ivan Tashkinov 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Egor Kislitsyn 88d3cb44c3 replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
6 years ago
Egor Kislitsyn 1b3d921921 change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
Egor Kislitsyn 4212527928 change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
Sergey Suprunenko 3db9235150
Ignore dates in wrong formats
6 years ago
Sachin Joshi f20e8d28de add support for all status type (ostatus) and replase case with if
6 years ago
Ivan Tashkinov aac48d0cc6 Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Sachin Joshi 6386c1c9c1 fetch url for OStatus to know if it is a/c or status
6 years ago
Haelwenn (lanodan) Monnier f56eef8d8c
router: Add fake identity proof endpoint
6 years ago
Sergey Suprunenko b6f9f7b8aa
Handle dates in the Unix timestamp format (Fixes #763)
6 years ago
Sachin Joshi 1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status
6 years ago
Ivan Tashkinov 6910fb371b Fixed local MastoFE authentication / `force_login` option.
6 years ago
Ivan Tashkinov cbe09d94d1 Added `force_login` authentication option (previously applied by default).
6 years ago
Alex S 3601f03147 Adding tag to emoji ets table
6 years ago
rinpatch fe5145eeaa Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
6 years ago
rinpatch 975482f091 insert object defaults for fake activities and make credo happy
6 years ago
rinpatch d866b59eea oof
6 years ago
rinpatch 45ba10bf47 Fix the issue with HTML scrubber
6 years ago
Ivan Tashkinov 804173fc92 [#923] Minor code readability fix.
6 years ago
Ivan Tashkinov eadafc88b8 [#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
rinpatch cd387f8693 Add a fake option to lazy_put_actvity_defaults
6 years ago
rinpatch 1bb4d5d65b Implement fake status submit
6 years ago
Egor 9a39d1d846 Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Haelwenn (lanodan) Monnier c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
Haelwenn (lanodan) Monnier 6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
Haelwenn (lanodan) Monnier 6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
eugenijm cd90695a34 Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API
6 years ago
Alex S 3ca6c4f443 password reset page labels align
6 years ago
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov 2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring.
6 years ago
lambda 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop'
6 years ago
rinpatch ce6d64bbd8 Fix missing announces in MastoAPI home timeline
6 years ago
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module
6 years ago
eugenijm a4ab60ac54 Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm 691d1208b5 Add GET /api/v1/apps/verify_credentials
6 years ago
lambda ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop'
6 years ago
lambda c6ab5ebe7c Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
6 years ago
lain 10a7a4a868 AP UserView: Refactor banner / avatar display code, add test.
6 years ago
lambda 9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
6 years ago
lambda 21ff78cd40 Merge branch 'replies-count' into 'develop'
6 years ago
rinpatch 406d19331f Remove ActivityRepresenter
6 years ago
Ivan Tashkinov eef1042b16 Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
eugenijm 568e348588 Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov b0759f821b Comments split.
6 years ago
Ivan Tashkinov 263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
Mark Felder c410296120 Try sending an empty map
6 years ago
Mark Felder 6f090f981b Attempt to fix incorrect federation of default instance avatars
6 years ago
kaniini 63ffa4842c Merge branch 'fix/mastoapi-liked' into 'develop'
6 years ago
rinpatch a7f58b3c13 Serve non-public activities in /api/v1/favourites
6 years ago
rinpatch 750de7d842 Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
6 years ago
William Pitcock debf7f016d ostatus: use preload objects with Object.normalize() when opportunistic
6 years ago
William Pitcock 8c70156157 activitypub: object view: use preloaded object when possible
6 years ago
William Pitcock ce47eb8b29 activitypub: when fetching objects, use the preloaded object from the synthesized activity
6 years ago
William Pitcock 07cdd9ed02 streamer: use the preloaded object if possible
6 years ago
William Pitcock c62220c500 rich media: helpers: only crawl Create activities
6 years ago
William Pitcock 4cedf45423 relay: use preloaded object since we always have it
6 years ago
William Pitcock e430a71d37 ostatus: fetch preloaded object in note handler for testsuite
6 years ago
William Pitcock 73efe95368 activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
William Pitcock ba7299fc87 activitypub: add missing with_preloaded_object()
6 years ago
William Pitcock e4307cadc8 activitypub: splice in the child object if we have one
6 years ago
William Pitcock a6973a668e formatting
6 years ago
William Pitcock b3bf523c09 rich media: use optimized Object.normalize()
6 years ago
William Pitcock e75e43b949 common api: use the optimized Object.normalize whenever possible
6 years ago
William Pitcock 9aea7cc224 activitypub: preload child objects when fetching timelines
6 years ago
rinpatch 1b33986bfa Fix text being nullable in TwitterAPI
6 years ago
lambda fee360e581 Merge branch 'safe-mentions' into 'develop'
6 years ago
lain e2afce34b6 NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
kaniini 1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
6 years ago
William Pitcock 3cc2554fa3 mastodon api: add conversation_id extension (ref #674)
6 years ago
William Pitcock fea3696799 common api: move context functions from twitterapi
6 years ago
rinpatch b92a16aa00 Merge branch 'ecto-3-migration' into 'develop'
6 years ago
lain bf27190f7f UtilController: Return state of safe dm mentions.
6 years ago
lain 8468f3f6d4 Add safe dm mode option.
6 years ago
Ivan Tashkinov af68a42ef7 [#923] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch 9a7b817c9a Ecto 3.0.5 migration
6 years ago
Ivan Tashkinov e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
William Pitcock 1685e4258f transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
6 years ago
William Pitcock cd055983c3 transmogrifier: when determining followers collection URI, we may need to fetch the actor
6 years ago
William Pitcock d487b753c3 activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
6 years ago
William Pitcock 798da28812 activitypub: transmogrifier: ensure as:Public activities are delivered to followers
6 years ago
Ivan Tashkinov 8d21859717 [#923] External User registration refactoring, password randomization.
6 years ago
Ivan Tashkinov 26b6354095 [#923] Support for multiple (external) registrations per user via Registration.
6 years ago
Zachary Dunn 5ba14c664b Fix missing end brace
6 years ago
Zachary Dunn a2e03d4f3c Initial attempt at updating return type
6 years ago
eugenijm 1588688a11 Added support for exclude_types, limit, and min_id in Mastodon
6 years ago
Ivan Tashkinov 2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Haelwenn (lanodan) Monnier f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
6 years ago
kaniini 6d6f48d079 Merge branch 'feature/federated-flags' into 'develop'
6 years ago
lambda 28df397454 Merge branch 'feature/oauth-me' into 'develop'
6 years ago
kaniini c69dc2acf1 Merge branch 'feature/reblog-muting' into 'develop'
6 years ago
William Pitcock e0edc706cf oauth: add me property to token responses
6 years ago