Commit Graph

1699 Commits (022e6e4b44229be70f0ec6720a66610a0e2a403a)

Author SHA1 Message Date
Ekaterina Vaartis 52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl
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 6069d0fd36 Fix object search depending on embeded object
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 8e4d950f31 Remove updating reply count for embeded objects
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 dda4e0e2a8 Fix warnings in object tests
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
lain c1ebb38d3a Conversation: Also create participations for remote users.
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 fd2e31af86 oops
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
Egor Kislitsyn dd097a406b add 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 6f880b1627 Conversation: Fix tests.
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
lain cf353514fe Participations: Add last activity.
6 years ago
lain 20d9b90760 Participation: Get for a user.
6 years ago
lain 280172f6f6 Conversations: Create or bump on inserting a dm.
6 years ago
lain 64c1c3a407 Participations: Add marking as read and unread.
6 years ago
lain d1da6b155a Conversation: Add Conversations and Participations.
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
rinpatch 144648de92 Merge branch 'mastoapi/plaintext-statuses' into 'develop'
6 years ago
lambda 0a02ed7a2f Merge branch 'bugfix/follower_count' into 'develop'
6 years ago
Sachin Joshi 07afb9b537 update the follower count when a follower is blocked
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
Sadposter 13ff312c48
Sever subscription in case of block
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
Alex S f0ca0696c8 test for valid_invite?
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
Sadposter 76fdfd1c7f Add check on activity visibility in sub notification
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
feld 876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop'
6 years ago
Alex S ce8d457132 little channges
6 years ago
Alex S 76d8928cf1 fix for field name
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
Alex S 0484f3a8b1 generating tokens with mix
6 years ago
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization
6 years ago
Sergey Suprunenko e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
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 a270e7a191
Mix format everything
6 years ago
Sadposter f6e131eeb9 Don't use twitterAPI for subscription tests
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
Sadposter 75c4ceb4a2 Add tests for subscriptions
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 ce9284b36f Merge branch 'remove-user-activities' 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
Egor Kislitsyn a14742f495 add `user delete_activities` mix task
6 years ago
Alex S 484162c187 test fix
6 years ago
Alex S 9b2188da7c refactoring of emoji tags config to use groups
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 17d3d05a71 code style
6 years ago
Alex S 3601f03147 Adding tag to emoji ets table
6 years ago
lain e3bf6655ba Add replying.
6 years ago
lain 10fdc080a0 BBS: Tests and formatting.
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 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 55d086b520 Notification controls
6 years ago