Commit Graph

2081 Commits (7722e5a67a46304f3ae0e37f674a44ca9268be5e)

Author SHA1 Message Date
Ivan Tashkinov 2b9d914089 [#161] Refactoring, documentation.
5 years ago
Eugenij 1f76740e10 Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
rinpatch 4c60a562a7 Fix not being able to pin unlisted posts
5 years ago
Ivan Tashkinov 5b7b1040b3 [#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
5 years ago
kaniini d1549a6375 Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
5 years ago
William Pitcock c22f0bfb80 test: add tests for mediaproxy warming policy
5 years ago
Maxim Filippov 90927e6a9a Kowalski, analysis!
5 years ago
Maxim Filippov 452ca5250d Merge admin and mastodon user views for reports
5 years ago
Sergey Suprunenko d53fb55bb7 Return correct response when reply to a direct message is not direct itself
5 years ago
Maksim Pechnikov 4ad15ad2a9 add ignore hosts and TLDs for rich_media
5 years ago
Maksim Pechnikov 0cb8e710fb add test
5 years ago
Maksim a0c4ebb4d7 [#184] small refactoring reset password
5 years ago
Eugenij f2c03425b0 Broadcast conversation update when DM is deleted
5 years ago
kaniini 27b9605de0 Merge branch 'rich_media_titles_two' into 'develop'
5 years ago
Alex S b37ede5df3 log capturing
5 years ago
Alex S 982cad0268 support for config groups
5 years ago
Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header'
5 years ago
Alex S 410add1c30 support for tuples with more than 2 values
5 years ago
lain 0e415921cd Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
lain 58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
5 years ago
Alex S f0fccb7578 fix for int and modules
5 years ago
kaniini 55742d978d Merge branch 'feature/mrf-anti-link-spam' into 'develop'
5 years ago
kaniini e3534f5b3c Merge branch 'oauth_secure_redirect' into 'develop'
5 years ago
feld b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'"
5 years ago
Alexander Strizhakov 32320c1ee9 Fixes for dynamic configuration
5 years ago
William Pitcock 21dacd4b15 unbreak polls
5 years ago
William Pitcock 736d8ad6be implement anti link spam MRF
5 years ago
Ivan Tashkinov 9f45f93949 Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
5 years ago
rinpatch c7acca2abb Mastodon API: Sanitize display names
5 years ago
rinpatch 49a49d3763 Merge branch 'removing-test-errors' into 'develop'
5 years ago
Haelwenn c34327b22e Merge branch 'fix/sanitize-report-content' into 'develop'
5 years ago
Alex S 2e2edcb461 capturing errors
5 years ago
Maksim a04bf131e0 [#570] add user:notification stream
5 years ago
rinpatch bf6aa6f1a8 Fix report content stopping to be nullable
5 years ago
rinpatch 44de34d170 Credo fixes
5 years ago
rinpatch e943905bd7 Add tests for report view
5 years ago
kaniini 52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop'
5 years ago
lain a440cf856d Mastodon API: Return the token needed for the chat.
5 years ago
rinpatch 62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
5 years ago
Maksim ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
lain eac298083f MastodonAPI: Add a way to update the background image.
5 years ago
lain 5965efb216 AccountView: Add user background.
5 years ago
Egor Kislitsyn a12f8e13c8 Improve <title> fallback; Add a test
5 years ago
Ivan Tashkinov 4b2c29016c [#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
lain 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
5 years ago
Egor Kislitsyn ad04d12de6 Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Sergey Suprunenko 365268d522 Add more tests for using media_proxy and whitelists
5 years ago
rinpatch dffc9f060a replace missing mock with a 404
5 years ago
rinpatch d020f68e87 Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
lain 7e9f7ea0c2 MastodonAPI: Add test for user search.
5 years ago
kaniini 3f6da9c45a Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
5 years ago
kaniini a511d2f900 Merge branch 'improve-search' into 'develop'
5 years ago
lain ad19bfc7fe Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
lain 827a51e777 CommonAPI: Add test for accept_follow_request.
5 years ago
lain 3115b64cfe Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
Egor Kislitsyn cfa5572d28 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain 024dfdc39c Typo + Linting.
5 years ago
lain 8b9a0dd4a7 User: Don't error out when following a user that's already followed.
5 years ago
Egor Kislitsyn 5b04f07a1e Limit search for unauthenticated users to local users only
5 years ago
kaniini e4babb1c9f Merge branch 'explicit-addressing' into 'develop'
5 years ago
Egor Kislitsyn 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Maksim Pechnikov d3d1704e84 Merge branch 'develop' into issue/941
5 years ago
rinpatch bbff7554de Add tests for get_existing_votes
5 years ago
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941
5 years ago
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
5 years ago
kaniini 9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
5 years ago
Maksim Pechnikov 64ada7f960 fix tests
5 years ago
Maksim Pechnikov f13d6c7f78 update api to set skip_thread_containment
5 years ago
lain 804b6a4d8f CommonAPI.Utils: Add tests.
5 years ago
lain 80d4d83aac CommonAPI: Add explicit addressing.
5 years ago
Maksim Pechnikov 080e1aa70e add option skip_thread_containment
5 years ago
rinpatch dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda 314758c25b Merge branch 'align-mastodon-conversations' into 'develop'
5 years ago
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch 2fe3a20638 Make error message about author's inability to vote more sensible
5 years ago
rinpatch c47da0e65d Add tests for poll view
5 years ago
William Pitcock 38a275b31f test: add tests for subchain policy
5 years ago
kaniini 5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop'
5 years ago
Sachin Joshi e394fc2eef fix the flaky test for users creation by admin
5 years ago
rinpatch cfa588e357 Fix Credo issues
5 years ago
rinpatch 65db5e9f52 Resolve merge conflicts
5 years ago
rinpatch 300d94c628 Add poll votes
5 years ago
Sachin Joshi ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
Sachin Joshi 5534d4c676 make bulk user creation from admin works as a transaction
5 years ago
kaniini e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
5 years ago
Sergey Suprunenko 2bbc2a801f Remove all follower collections but actor's from "cc"
5 years ago
William Pitcock f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
5 years ago
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching
5 years ago
lambda 2993361075 Merge branch 'hotfix/leaking-lists' into 'develop'
5 years ago
lain 7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
lain aaad85c4d9 AccountView: settings -> settings_store
5 years ago
lain eb2963bc43 User: Add settings store to Info, AccountView
5 years ago
rinpatch d9c0650ff9 Mastodon API: Fix lists leaking private posts
5 years ago
rinpatch a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it
5 years ago
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings
5 years ago
lambda 91ac8b075b Merge branch 'use-pleroma-config' into 'develop'
5 years ago
Egor Kislitsyn 99f70c7e20 Use Pleroma.Config everywhere
5 years ago
Maksim db94294dfb [#936] fix tests
5 years ago
Sachin Joshi 1452a96ad6 ability to set and reset avatar, profile banner and backgroud in Mastodon API
5 years ago
lambda 5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop'
5 years ago
William Pitcock 79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock 45e4642a58 tests: chase remote/local removal
5 years ago
William Pitcock 59a703fcbe twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock 1542cccbbc tests: chase notification setting changes
5 years ago
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants
5 years ago
William Pitcock 80d55d428f tests: websub: check only that signature validation succeeds or fails
5 years ago
Aaron Tinio 9415932af5 Keep nodeinfo available when not federating
5 years ago
Egor Kislitsyn a7affbdd6d Fix tests
5 years ago
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sachin Joshi 0c53d91f3b fix merge conflict
5 years ago
William Pitcock 8086c7aed6 tests: add tests for banner and avatar removal
5 years ago
rinpatch 19c90d47c4 Normalize poll votes to Answer objects
5 years ago
Maksim 620908a2db [#699] add worker to clean expired oauth tokens
5 years ago
lambda ff363f70b5 Merge branch 'refactor/keys' into 'develop'
5 years ago
rinpatch cdac5efd10 Merge branch 'bugfix/account_view_source.note' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
5 years ago
Sachin Joshi 17bfd000d7 Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini 79c2cef2fb Merge branch 'mongooseim-support' into 'develop'
5 years ago
William Pitcock 045803346d move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio f76268135c Fix failing test
5 years ago
Aaron Tinio 3ab9255eda Respond with a 404 Not implemented JSON error message
5 years ago
Aaron Tinio a13d449b24 Add tests for fallback routes
5 years ago
rinpatch 63b0b7190c MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch 0407ffe75f Change validation error status codes to be more appropriate
5 years ago
rinpatch aafe30d94e Handle poll votes
5 years ago
rinpatch 3f96b3e4b8 Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state
5 years ago
Sadposter dc916ba15f
Format mascot tests
5 years ago
Sadposter e81f0fc6d4
Add mascot get/set tests
5 years ago
Aaron Tinio 2375e9a95b Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch fd920c8973 Mastodon API: Add support for posting polls
5 years ago
William Pitcock dc08159538 also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock 0da1233e8e rich media: suppress link previews if post is marked as sensitive
5 years ago
lain f959bf7aa6 MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn f2936e0a07 Add `ap_id` to List
5 years ago
lain 249b31ffe5 Fix specs.
5 years ago
Alexander Strizhakov 7ed682213f Fix/902 random compile failing
5 years ago
Sachin Joshi 5c028b8f92 user creation admin api will create multiple users
5 years ago
Aaron Tinio 443cd68a4c Add tests for MRF.SimplePolicy
5 years ago
kaniini bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop'
5 years ago
Sergey Suprunenko e2b3a27204 Add Reports to Admin API
5 years ago
feld e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
5 years ago
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import
5 years ago
Egor Kislitsyn fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S 4711d8151c try this
5 years ago
Aaron Tinio 2b6119dfbf Restrict reblogs of activities from blocked domains
5 years ago
Aaron Tinio 64495b96e9 Add test for blocked domains
5 years ago
rinpatch 62e42b03ab Handle incoming Question objects
5 years ago
William Pitcock f09c3afdf5 chase test failures
5 years ago
William Pitcock c7644313e7 test: update obsolete test
5 years ago
lain f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini 62516be9c4 Merge branch 'fix/public-option-not-working' into 'develop'
5 years ago
lambda 4440e23547 Merge branch 'chore/extricate-http-signatures' into 'develop'
5 years ago
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
Sachin Joshi ee22fff5ac remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn a7a8f3bc2c Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio 70c81b95d0 Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
William Pitcock 071f78733a switch to pleroma/http_signatures library
5 years ago
Maksim 52297920e7 Refactoring oauth response.
5 years ago
Egor Kislitsyn d474995efa Add Tests
5 years ago
Egor Kislitsyn 5e2b491276 Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
lambda b14a314ce7 Merge branch 'feature/federator-behaviours' into 'develop'
5 years ago
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
5 years ago
Sachin Joshi 7701a4c841 Make irreversible field default to false in filters
5 years ago
William Pitcock 582bd9d170 tests: fix AP test failures
5 years ago
William Pitcock d823eb921b tests: fix salmon tests
5 years ago
William Pitcock 2b847d4add tests: chase federator publish_single_foo removals
5 years ago
kaniini 131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
5 years ago
Sachin Joshi f01f995816 make url uniform in admin api
5 years ago
Francis Dinh 2a54e8c1f5 Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
5 years ago
rinpatch e4523c3010 Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain a4598b5e8b Visibility: Make it more resilient.
5 years ago
Alexander Strizhakov bfeb33e951 Merge develop
5 years ago
rinpatch 3a7c14645e - Actually use preloaded bookmarks in views
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim 1040caf096 fix format
5 years ago
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier 2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier 85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
lain 81d1aa424d Streamer: Stream out Conversations/Participations.
5 years ago
Roman Chvanikov 8af55728e4 Fix tests
5 years ago
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator
5 years ago
lambda 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop'
5 years ago
Alex S f11e7037c2 test fixes
5 years ago
Sachin Joshi cd6da3606b Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
lain b0951a8849 WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch 0fd176b990 Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
5 years ago
kaniini 292c69481b Merge branch 'regression/rights-only-for-admin' into 'develop'
5 years ago
rinpatch 61ca2f7a4e Fix `rights` in TwitterAPI's user entity being present only for
5 years ago
rinpatch ce3789e39a Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch c3e9fcf098 Fix bookmarks depending on embeded object and move checking if the
5 years ago
kaniini 002ea343f8 Merge branch 'feature/bbcode' into 'develop'
5 years ago
William Pitcock ef52aa0e66 tests: fix up for changed bbcode library output and verify html is properly escaped
5 years ago
William Pitcock 501af917b5 add support for bbcode
5 years ago
lambda 4de5fef1f8 Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
5 years ago
kaniini 48f68fd133 Merge branch 'feature/mastoapi-new-config' into 'develop'
5 years ago
rinpatch dfc8425659 Move settings to Source subentity
5 years ago
Alex S 85953c0836 fixes for tests
5 years ago
Egor Kislitsyn c157e27a00 Merge branch 'develop' into feature/disable-account
5 years ago
William Pitcock 0fd0ffcd76 activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
rinpatch 4baea6e6d9 Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
5 years ago
Sachin Joshi 963d5774af fix the status notification with special char
5 years ago
Sergey Suprunenko 9dd36e5bcb Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)
5 years ago
rinpatch f60d072bbb Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
Egor b9cdf6d3b9 Use `User.get_cached*` everywhere
5 years ago
Alexander Strizhakov 88f0be9693 Feature/826 healthcheck endpoint
5 years ago
Egor Kislitsyn e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
kaniini 7fcbda702e Merge branch 'rework-emoji-management' into 'develop'
5 years ago
Roman Chvanikov 2662bea4e0 Add accounts and last_status to conversation read response
5 years ago
Ivan Tashkinov 9256d2d4b4 [#923] Refactored OAuthController#authorize definitions, added test.
6 years ago
eugenijm 375fd21055 Set correct values in the MastoAPI reblog status view
6 years ago
Ekaterina Vaartis aef3a3ca46 Fix tests that used finmoji
6 years ago
eugenijm fa48532387 Handle `reblogs` on the first follow request in MastoAPI
6 years ago
kaniini 9da8b287f8 Merge branch 'feature/database-compaction' into 'develop'
6 years ago
Alexander Strizhakov ada384207b typo fix
6 years ago
lambda 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
6 years ago
rinpatch 4ef237f26a Fix my incorrect search test fix
6 years ago
rinpatch 83589ca6a5 Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch 2abc09570f Use the preloaded object in tag queries
6 years ago
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users
6 years ago
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users
6 years ago
rinpatch 35ac672b8d Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
rinpatch d1eb578a57 Refactor tests that used ActivityPub.fetch_object_from_id
6 years ago
rinpatch ff8d76c670 Refactor all tests that acessed the embeded object
6 years ago
rinpatch 54b82f236b Fix note count test
6 years ago
rinpatch ad681877df Make credo happy
6 years ago
rinpatch e7c3c36766 Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
rinpatch b09ae02c04 Added some more normalization calls all in mastodon api controller
6 years ago
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction
6 years ago
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' 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
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
Alex S c5d0fffeaf naming fix
6 years ago
Alex S c349573791 Merge develop to 788-separate-email-addresses
6 years ago
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
6 years ago
Egor Kislitsyn d0304b4f92 more tests
6 years ago
lambda 0a09692c7d Merge branch 'features/mastoapi/2.6.0-min_id-pagination' 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
lain 36ec8d9694 ActivityPub: Fix specs.
6 years ago
Ivan Tashkinov c3f12cf3c3 [#923] OAuth consumer params handling refactoring.
6 years ago
lain c352a0aba6 Conversations: Make tests run.
6 years ago
Alex S fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S fe13a1d78c adding notify_email setting for trigger emails
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
lain b5cecebbc1 Conversations: Fix specs.
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
kaniini 97395e013e Merge branch 'notification-pleroma-settings' into 'develop'
6 years ago
rinpatch b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
Alex S fee50636d0 removing not needed invite update
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
Ivan Tashkinov 44829d9181 AdminApiControllerTest unused variables fix.
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
Alex S b810aac117 added docs to docs/api/admin_api.md
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
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 fac76bfa35 We actually want the user id not nickname in the test...
6 years ago
Mark Felder c746087f57 Also remove Repo functions in the tests
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 73afd13c21 Add subscription key to one test I forgot about
6 years ago
Sadposter 06cd547fc6 Format subscriptions related stuff
6 years ago
Sadposter d56866c824 Add subscribed status to user view
6 years ago
Egor Kislitsyn f1712cd2f1 Use PleromaJobQueue in Pleroma.Web.Push
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
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2
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
Egor Kislitsyn 20c619f85f replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
6 years ago
lambda 091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
6 years ago
lambda 26d509cc86 Merge branch 'get_by_id' into 'develop'
6 years ago
cascode 95c92c49c9 Fix account lookup for nicknames beginning with numbers
6 years ago
Egor Kislitsyn 9a59c26619 replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
6 years ago
Ivan Tashkinov 15ce710460 Added "GET /oauth/authorize" tests.
6 years ago
Egor Kislitsyn 11c2d6bdc4 change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
6 years ago
Egor Kislitsyn 1b3d921921 change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
Sergey Suprunenko 3db9235150
Ignore dates in wrong formats
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
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
Alex S 3601f03147 Adding tag to emoji ets table
6 years ago
rinpatch 1bb4d5d65b Implement fake status submit
6 years ago
Haelwenn (lanodan) Monnier 6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
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
lambda 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop'
6 years ago
rinpatch 776bb5137f Fix muting reblogs tests
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
Ivan Tashkinov 47b49ab1a1 Test for MastoAPI /api/v1/instance response structure (formatting fix).
6 years ago
lambda 9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
6 years ago
Ivan Tashkinov caf0e9cf33 Test for MastoAPI /api/v1/instance response structure.
6 years ago
lambda 21ff78cd40 Merge branch 'replies-count' into 'develop'
6 years ago
rinpatch aacdcac1be Credo is upset about me not remembering the alphabet
6 years ago
rinpatch 087662d4fb Fix formatting
6 years ago
rinpatch 406d19331f Remove ActivityRepresenter
6 years ago
eugenijm 568e348588 Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov 263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
William Pitcock 26b0c802c3 fix up missing announcements with preloads
6 years ago
rinpatch a32bcab04b Merge branch 'fix/eldap-warnings' into 'develop'
6 years ago
William Pitcock 4a3dd86a55 tests: fix up activity collision test
6 years ago
William Pitcock 73efe95368 activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
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 a223e65f35 tests: fixup
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
lain bf27190f7f UtilController: Return state of safe dm mentions.
6 years ago
link0ff f858df819b Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
6 years ago
lain 8468f3f6d4 Add safe dm mode option.
6 years ago
William Pitcock 455bb526f6 test: add test for list sanitization
6 years ago
William Pitcock fd0aa58ee0 tests: add test for as:Public issues
6 years ago
kaniini 43bd7f47db Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
6 years ago
eugenijm 1588688a11 Added support for exclude_types, limit, and min_id in Mastodon
6 years ago
Haelwenn (lanodan) Monnier 42d034505a
Add test for conversation API beforehand
6 years ago
Fong-Wan Chau 4ed2618f6c Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
6 years ago
Maxim Filippov 76a13bc5a2 Fix test
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 40134598a8 test: fix defective ldap setup/teardown
6 years ago
William Pitcock e0edc706cf oauth: add me property to token responses
6 years ago
eugenijm 43fb03be5a Allow to mark a single notification as read
6 years ago
kaniini 8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
6 years ago
link0ff a070dd4a83 Add tests for LDAP authorization
6 years ago
Karen Konou ebfc10c834 Fix streamer test
6 years ago
Karen Konou da53c079db Refactor to store user ap_id, add tests
6 years ago
Karen Konou 13c298d354 Fix tests to assume reblogs shown by default
6 years ago
Haelwenn 41fc67aa49 Merge branch 'mastoapi/mime_type' into 'develop'
6 years ago
rinpatch d7a34b604b Extend MastoAPI to provide attachment mimetypes
6 years ago
eugenijm 100413bf2c Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
William Pitcock 414d4b8088 test: add a test for accepting inbound Flag activities
6 years ago
Maxim Filippov 257d8e78e5 Add tags
6 years ago
Maxim Filippov 4872914d32 Add test when local is false
6 years ago
Maxim Filippov d5edff6ce6 Fix test
6 years ago
Maxim Filippov 490d9cf7b1 Add "local" to users admin API
6 years ago
Haelwenn (lanodan) Monnier 23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
Haelwenn (lanodan) Monnier c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Haelwenn (lanodan) Monnier 6c8743d0c0
[Credo] Fix the warnings
6 years ago
Maxim Filippov 25eb6cf1cb Add "roles" to users admin API
6 years ago
kaniini c231ed610a Merge branch 'masto-api-followers-following' into 'develop'
6 years ago
eugenijm 984b5f8adf MastoAPI followers/following endpoints
6 years ago
lain 3474066f6d MastoAPI Accounts: Add fetching by nickname.
6 years ago
lambda 2c8deecdd2 Merge branch 'add-local-field-to-status' into 'develop'
6 years ago
lain 4811eefa6e MastoAPI StatusView: Add locality indicator.
6 years ago
eugenijm 6038c8a753 Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
kaniini 735f40047a Merge branch 'delete-status' into 'develop'
6 years ago
kaniini 130fc9eae6 Merge branch 'fetch-posts-on-first-federation' into 'develop'
6 years ago
eugenijm 2827dfea50 Allow an admin to delete a user status
6 years ago
Ekaterina Vaartis b775fded10 Add tests for fetch_ordered_collection
6 years ago
William Pitcock 3c5926fe91 tests: add regression test
6 years ago
rinpatch 992145e64c Merge branch 'bugfix/delete-activity-audience' into 'develop'
6 years ago
eugenijm 7342b5a45f Preserve parameters in link headers (Mastodon API)
6 years ago
kaniini 0fe715f3ba Merge branch 'chore/merge-search-into-list-users' into 'develop'
6 years ago
kaniini 07f8c79a69 Merge branch 'bugfix/rel-me_list' into 'develop'
6 years ago
Maksim bc7570c282 [#647] tests for web push
6 years ago
Karen Konou 28d5b40d0a Add handling of objects not in database
6 years ago
rinpatch bcd8ef65e0 Merge branch 'add-admin-to-node-info' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 788a354ce0
Web.RelMe: Fix having other values in rel attr
6 years ago
eugenijm d1de0a30cc Include admins in nodeinfo
6 years ago
Maxim Filippov e34710b988 Format & update docs
6 years ago
William Pitcock 9f3cb38012 helpers: use AutoLinker to validate URIs as well as the other tests
6 years ago
William Pitcock d7a278a733 tests: add tests for rich media helper functions
6 years ago
kaniini d45dbdce5a Merge branch 'feature/add-status-text-to-notifications' into 'develop'
6 years ago
Maxim Filippov f620199836 Merge search endpoint into /users
6 years ago
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts)
6 years ago
kaniini ca5d894e68 Merge branch 'fix/like-adressing' into 'develop'
6 years ago
rinpatch 33c614bce0 Stop adresssing like activities to actor's follower collection on non-public posts
6 years ago
Karen Konou aab86698a5 Expand "to" of delete activities
6 years ago
eugenijm 86e4b48a5e Fix DM visibility for blocking users
6 years ago
kaniini ace4231628 Merge branch 'features/bio_rel_me' into 'develop'
6 years ago
kaniini 6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
6 years ago
kaniini c93479c6f5 Merge branch 'count-only-public-statuses' into 'develop'
6 years ago
eugenijm d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore.
6 years ago
lambda 9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
6 years ago
eugenijm c46950d3b1 Increment user note count only on public activities
6 years ago
Maxim Filippov 2ec8cf5665 Add pagination to search
6 years ago
rinpatch f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
6 years ago
Haelwenn (lanodan) Monnier 25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
6 years ago
Haelwenn (lanodan) Monnier bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting
6 years ago
Maxim Filippov f384a9a256 Format
6 years ago
Maxim Filippov f1a4c3163b Show current user in users list as well
6 years ago
Maxim Filippov 5b08b470f6 Add "local" params to users search
6 years ago
rinpatch 9c6abec4d8 use commonapi.post instead of activitybulder
6 years ago
rinpatch 1341ee650e [#675] Do not show DMs in mentions timeline
6 years ago
Maxim Filippov 46f29b9da1 Add search users endpoint
6 years ago
Maxim Filippov 70e82a3465 Add test for the second page
6 years ago
kaniini cf426a719d Merge branch 'with-mutes' into 'develop'
6 years ago
kaniini 3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop'
6 years ago
eugenijm 6b11011039 Added deactivated to the user view
6 years ago
Maxim Filippov 2883f75a3a Add pagination to users admin API
6 years ago
lain bbbdbec4fd Remove parts of the old activity view.
6 years ago
lain 9ade1242c2 Add user muted status info to twitterapi.
6 years ago
lain c1ae495878 Add user muted status info to MastodonAPI.
6 years ago
lain c4235f96bd Add `with_muted` param.
6 years ago
William Pitcock 1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
Egor Kislitsyn 5d961d536c fix formatter
6 years ago
Maxim Filippov ed7fd6b47e Add missing docs and tests
6 years ago
Egor c3ac9424d2 AutoLinker
6 years ago
lain 9e0686efa6 Move visibility into own module.
6 years ago
lain 62296f5a25 Fix private post card handling.
6 years ago
KZ 7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty
6 years ago
William Pitcock e95dbecf3e tests: fix formatting
6 years ago
William Pitcock aa45674be6 tests: add test for fetching AP objects with application/json.
6 years ago
William Pitcock 3ee77e95b2 tests: fix tests
6 years ago
Egor bff9eb5ef7 Reports
6 years ago
lain 59c27f29c8 Add some nicer urls in status view.
6 years ago
Ivan Tashkinov 6fe7acd58e [#468] Merged `upstream/develop`.
6 years ago
lambda 11b3c10c54 Merge branch 'muting' into 'develop'
6 years ago
lain 9ae79bb71a Add test for muting functionality.
6 years ago
Ivan Tashkinov 337367d764 [#468] More OAuth scopes-specific tests.
6 years ago
Ivan Tashkinov 04ee877a20 [#468] Added OAuth scopes-specific tests.
6 years ago
Ekaterina Vaartis ad2cf4fd86 Add test for mastodon muting endpoints
6 years ago
eugenijm 25b9e7a8c3 Added admin API for changing user activation status
6 years ago
Ivan Tashkinov c0ecbf6669 [#468] Merged `upstream/develop`.
6 years ago
kaniini 833161b5d2 Merge branch 'feature/jobs' into 'develop'
6 years ago
kaniini 7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
6 years ago
kaniini c23bd05737 Merge branch 'features/flavour-switching' into 'develop'
6 years ago
kaniini cd019a5927 Merge branch 'follow-request-count' into 'develop'
6 years ago
kaniini 3f38a05571 Merge branch 'csv-export' into 'develop'
6 years ago
Maxim Filippov fd17a0cc9b Fix test
6 years ago
lambda 79e503b3f5 Merge branch 'docker-speedup' into 'develop'
6 years ago
lain 71c8c60ded More speedup, test fixes.
6 years ago
rinpatch d0a94f98e0 more tests for HellthreadPolicy
6 years ago
Ivan Tashkinov bc4f77b10b [#468] Merged `upstream/develop`, resolved conflicts.
6 years ago
Haelwenn (lanodan) Monnier 72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
6 years ago
lain 38e15930cb Add option to return all friends in twitter api.
6 years ago
rinpatch 921571c19b Merge branch 'hellthread-filter-fix' into 'develop'
6 years ago
Karen Konou dca6bee2f7 Rename test, add check for follower collection when delisting
6 years ago
Karen Konou d943c90249 Add tests, change default config values, fix a bug
6 years ago
eugenijm ecdf0657ba Add logic for keeping follow_request_count up-to-date on the `follow`,
6 years ago
lambda ea2698beb7 Merge branch 'bugfix/activitypub-reserialization' into 'develop'
6 years ago
kaniini 19756d68f2 Merge branch 'fix/credo-issues-test' into 'develop'
6 years ago
William Pitcock e031cc6473 tests: update tests for totalItems leak fix
6 years ago
William Pitcock 64620d8980 activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
William Pitcock 889ad95a2a tests: add some reserialization tests based on IR differences
6 years ago
Ivan Tashkinov 063baca5e4 [#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
William Pitcock d54c483964 tests: add tests for endpoints
6 years ago
Maxim Filippov 62a45bdc11 Add revoke token
6 years ago
Maxim Filippov 61a4bc5095 Add OAuth tokens endpoint
6 years ago
rinpatch 379d04692c Filter summary in keywordpolicy
6 years ago
Karen Konou ac72b578da Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou c01ef574c1 Refactor as per Rin's suggestions, add endpoint tests
6 years ago
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
Haelwenn (lanodan) Monnier 74579115a7
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
6 years ago
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es
6 years ago
Karen Konou 6a150de3bd Add unique index and unique constraint check, uniqueness test fails
6 years ago
Karen Konou 478a05b4c9 Merged "check mute" test into the other two
6 years ago
Karen Konou a0d732ec55 it works!!
6 years ago
Karen Konou 4430a0ad12 added another test
6 years ago
Karen Konou 09189c3a7c Made a test!
6 years ago
rinpatch b05a341187 oof
6 years ago
rinpatch 9a23f8f3ea Add tests and fix a typo in docs
6 years ago
Mark Felder 74518d0b60 hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
6 years ago
Haelwenn 1220a17146 Merge branch 'bugfix/rich-media-card' into 'develop'
6 years ago
William Pitcock 26670b09a7 tests: add a rich media card that contains all relevant fields
6 years ago
William Pitcock 6eb8c1eb92 test: add some regression tests for the rich media card rendering
6 years ago
Egor Kislitsyn 5b1d7c3c56 fix tests
6 years ago
Egor Kislitsyn 6f05f448f8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
eugenijm 035eaeb9b8 Allow to configure visibility for admin and moderator badges
6 years ago
eugenijm 398c81f9c8 Add is_admin and is_moderator boolean fields to the user view
6 years ago
William Pitcock 73e6a1f1dd test: twitterapi: fix another possible test failure case
6 years ago
kaniini eb2b1960e0 Merge branch 'feature/split-hide-network-v2' into 'develop'
6 years ago
William Pitcock c4d317ccb6 test: twitterapi: fix the test breakage for real
6 years ago
Egor Kislitsyn 3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
Maxim Filippov 16ce129e38 Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
lambda 69a38644bc Merge branch '589-fix-cache' into 'develop'
6 years ago
lain e61f0be951 Unbreak all the tests.
6 years ago
lain 505a084058 Still do caching in tests.
6 years ago
Ivan Tashkinov 3913b0196e [#582] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
6 years ago
Ivan Tashkinov b40b4bc4e5 [#582] Optimized federation retirement by reducing the number of SQL calls
6 years ago
kaniini 486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'"
6 years ago
href 7e384a2425 Merge branch 'develop' into 'develop'
6 years ago
Luna e8c7be38fc add tests for nodeinfo 2.0 compat and 2.1's new field
6 years ago
kaniini 0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop'
6 years ago
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
6 years ago
Luna c05928dbda use nodeinfo 2.1, add repository field
6 years ago
William Pitcock 3f5b784596 test: rich media: parser: add malformed data regression test
6 years ago
Haelwenn 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop'
6 years ago
Egor Kislitsyn d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
lain c53b96a024 Fix specs.
6 years ago
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
6 years ago
Ivan Tashkinov 92753b0cd9 [#534] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
Haelwenn ebb3496386 Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
6 years ago
William Pitcock 61d6715714 rich media: oembed: return data in the same format as the other parsers
6 years ago
Maxim Filippov 3e968f9ef2 Format
6 years ago
Maxim Filippov 50d6183893 Split hide_network into hide_followers & hide_followings
6 years ago
Egor Kislitsyn 55affbca7f add a job queue
6 years ago
Ivan Tashkinov d3f9e6f6fe [#534] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance.
6 years ago
lain 8e8a1e1ba8 Return new-style config if old-style config is set to false.
6 years ago
lain 1825118fd4 Correctly handle invalid credentials on auth login.
6 years ago
William Pitcock 339c26e12b test: add status posting with OGP link preview test
6 years ago
William Pitcock 6096846f5f API: kill /api/rich_media/parse endpoint
6 years ago
William Pitcock 020b3b29d9 test: update twitterapi tests
6 years ago
William Pitcock 364cf5369b test: update mastodon status view tests
6 years ago
William Pitcock 132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
Haelwenn (lanodan) Monnier cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
kaniini 5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
6 years ago
William Pitcock 1f7843b9b8 mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
Haelwenn (lanodan) Monnier 3f64379b13 Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
Haelwenn (lanodan) Monnier d9f3af477d Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
6 years ago
Haelwenn (lanodan) Monnier 22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
6 years ago
Haelwenn (lanodan) Monnier 5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
Haelwenn (lanodan) Monnier 4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
Haelwenn (lanodan) Monnier d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
6 years ago
Haelwenn (lanodan) Monnier 499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
6 years ago
Ivan Tashkinov d99650270b [#534] Federation reachability filtering tests.
6 years ago
rinpatch a45a903480 Fix OGP provider tests
6 years ago
rinpatch 3a5b3c5a3a Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
kaniini 4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop'
6 years ago
kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider'
6 years ago
kaniini 4df71cd88b Merge branch 'classic-flakeids' into 'develop'
6 years ago
Maxim Filippov 9274cabe01 Use correct logic to determine "attentions" list
6 years ago
William Pitcock 13d72826df test: add anti-followbot policy tests
6 years ago
Maxim Filippov 4333fea1dc Send "hide_network" in user_view
6 years ago
lain 2de208817c Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
lain e221c681dc New frontend configuration mechanism.
6 years ago
href 28d77e373c
Flake Ids for Users and Activities
6 years ago
Ivan Tashkinov 34d59e4008 [#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
lain 762fafe738 Fix buggy test.
6 years ago
lambda 69454c8345 Merge branch 'feature/dm-sanity' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
kaniini 5803672ae5 Merge branch '116-send-delete-event' into 'develop'
6 years ago
lain cf1f35a93a Send delete event over Mastodon streaming api
6 years ago
lambda 501fba33d6 Merge branch 'add-custom-emoji-test' into 'develop'
6 years ago
lain be0fb5dec4 Add a test to ensure #39 is fixed.
6 years ago
lambda f3045a179e Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
6 years ago
William Pitcock cf3099231d test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility
6 years ago
William Pitcock 21ac35fcc0 tests: add tests for DM sanitizer
6 years ago
William Pitcock 8d06be35e0 activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
kaniini 42612b1c8d Merge branch 'bugfix/improve-boost-targeting' into 'develop'
6 years ago
Maxim Filippov 0a97badddd Format
6 years ago
Maxim Filippov 651a1d64b5 Add current user to mentioned
6 years ago
William Pitcock 31517bec12 test: add regression test for to/cc clobbering
6 years ago
Maxim Filippov e116e55cab Add actor to recipients
6 years ago
rinpatch 74346a7035 Fix merge conflict
6 years ago
rinpatch 7bc6208b2f Fix ostatus test
6 years ago
Ivan Tashkinov ed8f55ab8e [#477] User: FTS and trigram search results mixing (to handle misspelled requests).
6 years ago
rinpatch 1b1af4798a Use object instead of activity for metadata
6 years ago
rinpatch 64143d8040 Fix object id in OpenGraph test
6 years ago
Ivan Tashkinov 954dc4a4ad [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
6 years ago
rinpatch 3b18789684 Fix test
6 years ago
rinpatch 293f6a8b71 join us now and share the software~. Also tests
6 years ago
lain 943324b661 MastoAPI: Don't break on missing users.
6 years ago
lambda 608cc65d43 Merge branch 'feature/improve-microformats' into 'develop'
6 years ago
Ivan Tashkinov 90433b988e [#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
6 years ago
rinpatch 8cea00e1dc Remove OpenGraph test from Ostatus tests
6 years ago
William Pitcock 85a5be6220 tests: fixup
6 years ago
Ivan Tashkinov fc965f982c [#477] Added FTS index for `users`. Fixed failing test.
6 years ago
kaniini de1da7b3d1 Merge branch 'feature/add-oembed-parser' into 'develop'
6 years ago
kaniini fa0392e49c Merge branch 'activitypub-likes' into 'develop'
6 years ago
Sadposter 98d9ae0718 Add test for mastodon API /favourites endpoint
6 years ago
rinpatch e4dc3f71ae Resolve merge conflict
6 years ago
Maxim Filippov b8a77c5d70 Add OEmbed parser
6 years ago
sxsdv1 868034375c Add likes to activitypub object representation
6 years ago
sxsdv1 581edd5a91 Add route to get object like activities
6 years ago
sxsdv1 36711e1c83 Handle client submitted activitypub like activity
6 years ago
sxsdv1 1eb7318831 Prepare all types objects before serialising
6 years ago
Egor Kislitsyn 728587fdaa typo
6 years ago
Egor Kislitsyn b594a54d0c unpin when deleting a status
6 years ago
kaniini e4afe1359b Merge branch 'activitypub-dereference-activity-id' into 'develop'
6 years ago
Maxim Filippov 1f851a0723 Add Twitter Card parser
6 years ago
kaniini 11d08c6226 Merge branch 'twapi-follower-pagination' into 'develop'
6 years ago
Haelwenn ab4c5f5bf7 Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
6 years ago
William Pitcock 490c80bc96 test: common api: add tests for format_input/4
6 years ago
kaniini 7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop'
6 years ago
kaniini d203b0b4d3 Merge branch 'dm-optimizations' into 'develop'
6 years ago
lain a99e156f2c Add integer casts.
6 years ago
lain 7ac152ed38 TwitterAPI: Add follower/following pagination.
6 years ago
lambda 1881680e28 Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
6 years ago
lain 8df348a3da Add test for summary_html
6 years ago
lain 5027f82cde Add activity visibility index.
6 years ago
Egor Kislitsyn 6cbe63726d improve tests
6 years ago
Egor Kislitsyn 44a1e69484 Add Twitter API for the pinned statuses
6 years ago
Egor Kislitsyn 1b06e6fdf3 only non-reblogs, self-authored, public statuses can be pinned
6 years ago
sxsdv1 20c0dd1e24 Support activity+json request for activity
6 years ago
Egor Kislitsyn 0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn 7b6c5f0a9d improve test readability
6 years ago
Egor Kislitsyn db6f4496eb fix test
6 years ago
Egor Kislitsyn e679da4c34 add `pinned` property to `StatusView`
6 years ago
Egor Kislitsyn 63dbd87568 rename `post` to `status`
6 years ago
lain a16b17cc61 Actually put some onformation in the error user, make it actually properly parse
6 years ago
kaniini 74e1093732 Merge branch 'resilient-user-view' into 'develop'
6 years ago
Egor Kislitsyn f24087f96e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn 380e9fba21 add pinned posts
6 years ago
lain 7dcafb4894 MastoAPI: Add test.
6 years ago
lain 7382adf407 Make TwAPI UserView more resilient to issues.
6 years ago
scarlett 52493467ac Twitter API: Add a summary_html field.
6 years ago
kaniini 576368237c Merge branch 'activitypub-tombstone-fix' into 'develop'
6 years ago