Egor Kislitsyn
d474995efa
Add Tests
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Aaron Tinio
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
5 years ago
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
rinpatch
15cda998f3
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
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'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
Francis Dinh
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
5 years ago
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain
a33bec7d58
Conversations: Import order, import as read.
5 years ago
lain
a4598b5e8b
Visibility: Make it more resilient.
5 years ago
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
rinpatch
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain
eb0fb73ddb
BBS: Credo fixes.
5 years ago
lain
c58fd4c038
BBS: Fix tests.
5 years ago
lain
4c76f49e60
BBS: small fixes.
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
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
d70af32127
Pleroma.User: remove emojify on parse_bio
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
lambda
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
5 years ago
AkiraFukushima
a53a6c9d64
Add oauth plug tests for url and body parameters
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'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
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
Roman Chvanikov
0f0cc2703b
Merge develop
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'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
5 years ago
kaniini
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
5 years ago
rinpatch
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
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
...
status is bookmarked to SQL
5 years ago
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
6 years ago
William Pitcock
ef52aa0e66
tests: fix up for changed bbcode library output and verify html is properly escaped
6 years ago
William Pitcock
501af917b5
add support for bbcode
6 years ago
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
6 years ago
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
6 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
6 years ago
rinpatch
dfc8425659
Move settings to Source subentity
6 years ago
Alex S
85953c0836
fixes for tests
6 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
6 years ago
Alex S
73d01857e3
bookmarks in separate table
6 years ago
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
6 years ago
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
6 years ago
Sachin Joshi
963d5774af
fix the status notification with special char
6 years ago
kaniini
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
6 years ago
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
6 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
6 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
6 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
6 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
Roman Chvanikov
724311e151
Fix Credo warnings
6 years ago
Roman Chvanikov
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Ekaterina Vaartis
aef3a3ca46
Fix tests that used finmoji
6 years ago
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'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
Roman Chvanikov
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov
bc7862106d
Fix tests
6 years ago
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
6 years ago
Roman Chvanikov
aeafa0b2ef
Add Notification.for_user_since/2
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
lambda
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
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
Roman Chvanikov
2f0203a4a1
Resolve conflicts
6 years ago
Roman Chvanikov
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
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'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
Haelwenn
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
6 years ago
Normandy
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
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.
...
Needed to get the participating user list.
6 years ago
lambda
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
6 years ago
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
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
Roman Chvanikov
dc21181f65
Update updated_at field on notification read
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
Roman Chvanikov
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov
371a4aed2c
Add User.Info.email_notifications
6 years ago
Alex S
c5d0fffeaf
naming fix
6 years ago
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
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'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
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.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
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'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
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'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
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'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
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'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
6 years ago
lambda
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
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'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
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'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
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
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
lambda
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
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
...
code style and little renamings
6 years ago
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
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'
...
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
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
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
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
...
fix for twitter api tests
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
...
Added in pleroma extensions, but can be moved whenever
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
...
# Conflicts:
# mix.exs
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'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
6 years ago
lambda
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
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
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
lambda
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
6 years ago
lambda
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
6 years ago
lambda
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
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'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
6 years ago
lambda
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
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
...
little fix
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
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
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
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'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
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'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
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'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
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'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
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'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
6 years ago
William Pitcock
4a3dd86a55
tests: fix up activity collision test
6 years ago
William Pitcock
aaec91b9a1
relay test: don't do preloading (since follow objects are activities, it's a mess)
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'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
rinpatch
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
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
kaniini
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
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
optikfluffel
00c5d7248f
fix UploadTest to use new image_tmp.jpg
6 years ago
optikfluffel
a907522690
used imageOptim to reduce size of image files
6 years ago
kaniini
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
6 years ago
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
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
Maxim Filippov
93291c3d7a
Order users by nickname
6 years ago
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
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'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
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'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
6 years ago
rinpatch
355f285a86
Fix uploaded media plug test
6 years ago
William Pitcock
414d4b8088
test: add a test for accepting inbound Flag activities
6 years ago
rinpatch
e2fe796c63
Add some tests
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
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
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'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
rinpatch
faf238c1b0
Fix upload tests
6 years ago
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
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'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
6 years ago
kaniini
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
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'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
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'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
kaniini
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
Haelwenn
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
6 years ago
Karen Konou
28d5b40d0a
Add handling of objects not in database
6 years ago
rinpatch
40ff8f5964
Add tests for reserved char escaping in upload
6 years ago
rinpatch
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
6 years ago
Haelwenn (lanodan) Monnier
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
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'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
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'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
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'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
6 years ago
kaniini
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
6 years ago
kaniini
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
6 years ago
kaniini
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
6 years ago
eugenijm
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
6 years ago
lambda
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
6 years ago
eugenijm
c46950d3b1
Increment user note count only on public activities
6 years ago
eugenijm
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
6 years ago
Maxim Filippov
bf30df99cb
We do not guarantee the order of elements when we search
6 years ago
Maxim Filippov
2ec8cf5665
Add pagination to search
6 years ago
rinpatch
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
6 years ago
Haelwenn (lanodan) Monnier
7b9868f343
Pleroma.UserTest: Add tests for rel=me
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
a25c1313ae
Format
6 years ago
Maxim Filippov
aaa9fed1ca
Fix user_test
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'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
kaniini
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
6 years ago
kaniini
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
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.
...
Not used anymore.
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
lain
8d8cb08f94
Add follow request test.
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
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
lambda
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
6 years ago
lain
4196d9af11
Add test for User.mutes and so on.
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'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
kaniini
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
kaniini
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
kaniini
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
6 years ago
Maxim Filippov
fd17a0cc9b
Fix test
6 years ago
lambda
79e503b3f5
Merge branch 'docker-speedup' into 'develop'
...
Docker speedup
See merge request pleroma/pleroma!837
6 years ago
lambda
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
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
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
Haelwenn (lanodan) Monnier
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
6 years ago
lain
f469a8610f
Check that the welcome message is sent from the correct user.
6 years ago
lain
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
lain
d812a347ca
Add optional welcome message.
6 years ago
rinpatch
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
Karen Konou
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
rinpatch
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
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`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
William Pitcock
32b1649434
test: user: add a test for whether user search returns a user or not
6 years ago
lambda
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
Egor Kislitsyn
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
kaniini
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
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
lain
88a4de24f9
User.follow_all: Respect blocks in both directions.
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
lambda
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
Egor Kislitsyn
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
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
rinpatch
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
6 years ago
kaniini
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
6 years ago
lain
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
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
lain
bbd0049fae
Respect blocks in mass follow.
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
...
This was a dirty regex replace which worked on my server
6 years ago
Haelwenn
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
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'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
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
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
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'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
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.
...
Added tests.
6 years ago
Ivan Tashkinov
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
href
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
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'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
Luna
c05928dbda
use nodeinfo 2.1, add repository field
...
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
6 years ago
href
308b35ebe2
User.follow_all: ensure its stays unique
6 years ago
William Pitcock
106475f265
test: http mocks: formatting
6 years ago
William Pitcock
3f5b784596
test: rich media: parser: add malformed data regression test
6 years ago
William Pitcock
4e76f9fde1
test: add malformed OGP data fixture
6 years ago
lambda
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
kaniini
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
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
lain
47ec690c54
Use race-condition free mass follow.
6 years ago
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
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'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
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.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
lain
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
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
lain
2e277dd4ad
Fix objects.
6 years ago
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
kaniini
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
6 years ago
href
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
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
lain
aa8ddfdbe2
SPC fixes: Fix activities.
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'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
kaniini
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
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
422e60ad76
2019
6 years ago
href
9d63b27dcd
Test FlakeID old id compat & Ecto type
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
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
6 years ago
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
Ivan Tashkinov
789a9843da
[ #530 ] Fixed test.
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'
...
Send delete event over Mastodon streaming api
Closes #116
See merge request pleroma/pleroma!688
6 years ago
lain
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
lambda
501fba33d6
Merge branch 'add-custom-emoji-test' into 'develop'
...
Add a test to ensure #39 is fixed.
See merge request pleroma/pleroma!687
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'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
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'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
kaniini
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
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
lain
5d4d51e6dc
Add fixes for SPC users.
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
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
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
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
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'
...
improve microformats support
See merge request pleroma/pleroma!672
6 years ago
lambda
da4b670451
Merge branch '518_instance_stats_fix' into 'develop'
...
[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
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
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
6 years ago
Ivan Tashkinov
fc965f982c
[ #477 ] Added FTS index for `users`. Fixed failing test.
6 years ago
Haelwenn (lanodan) Monnier
9fcdca1bdc
Upload: Fix uploading with a : in the filename
6 years ago
Haelwenn (lanodan) Monnier
e3eb75bd23
Upload: Fix uploading with a ? in the filename
6 years ago
rinpatch
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
6 years ago
Shadowfacts
dcbe5bd58c
Add attachment escaping test
6 years ago
Ivan Tashkinov
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
kaniini
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
6 years ago
kaniini
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
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
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
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
...
Activities returned from inbox can include other types of objects like
Article
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'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
Maxim Filippov
1f851a0723
Add Twitter Card parser
6 years ago
kaniini
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
Haelwenn
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
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'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
kaniini
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
6 years ago
kaniini
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
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'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
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
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
6 years ago
Egor Kislitsyn
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
lain
26938d65fd
Add User mass following function.
6 years ago
Egor Kislitsyn
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
sxsdv1
20c0dd1e24
Support activity+json request for activity
6 years ago
kaniini
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
6 years ago
William Pitcock
567651fb3f
test: user: add tests for visible_for?/2
6 years ago
William Pitcock
f2a4f89abe
tests: user: add tests for superuser?/1
6 years ago
William Pitcock
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
6 years ago
William Pitcock
4124c9aa4a
tests: user: add regression test for remote_or_auth_active?/1
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
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
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
...
in conversations.
6 years ago
kaniini
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
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.
...
Will work for missing users and badly migrated users.
6 years ago
scarlett
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
6 years ago
Sadposter
042852ecf3
Add check to prevent multiple follow notifications from the same user
6 years ago
kaniini
8d047c7a72
Merge branch 'fix/user-search-null-name' into 'develop'
...
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
6 years ago
kaniini
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
6 years ago
scarlett
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
scarlett
57df7d6e1d
Add tests for emoji and lack of HTML in summaries.
6 years ago
scarlett
096e121879
Remove redundant comma.
6 years ago
scarlett
6556be344d
Resolve some test failures.
6 years ago
sxsdv1
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
6 years ago
cascode
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
6 years ago
kaniini
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
kaniini
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
cascode
4c5ee4c62b
formatted
6 years ago
cascode
ab6ebbae67
added test for #499
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
Maxim Filippov
48e81d3d40
Add RichMediaController and tests
6 years ago
sxsdv1
4e1cc2bab6
Implement delete activity
6 years ago
sxsdv1
551c3d9391
Split create activity specifics from update_outbox
6 years ago
Maxim Filippov
2aab4e03c3
Add OGP parser
6 years ago
kaniini
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
lambda
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
6 years ago
Rin Toshaka
9f5881cbb1
Fix a typo in user_test.ex
6 years ago
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
rinpatch
05743e2000
Get default scrubbers from config instead of hardcoded
6 years ago
rinpatch
91d5a7e81c
Fix test failure
6 years ago
Michael Loftis
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
sxsdv1
569bad8210
Create activity when client posts to outbox
6 years ago
sxsdv1
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
6 years ago
sxsdv1
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
kaniini
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
Ivan Tashkinov
242cc9a658
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
Ivan Tashkinov
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
Ivan Tashkinov
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Vyr Cossont
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
kaniini
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
kaniini
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
lain
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
Maxim Filippov
012b7ab5e6
Add test to check /object/:id does not leak the tombstone itself
6 years ago
lain
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
Maxim Filippov
340dd7a75e
Format
6 years ago
Maxim Filippov
ab2ee43634
Fix Activity test
6 years ago
Maxim Filippov
aeb89bece6
Remove unused test
6 years ago
Maxim Filippov
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
Maxim Filippov
2bbec33c71
Fix failing tests
6 years ago
Maxim Filippov
18a4cbb244
Capitalize "tombstone"
6 years ago
Maxim Filippov
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
William Pitcock
3c08d229db
tests: add legal boilerplate
6 years ago
William Pitcock
a2bceaf688
tests: twitter api: add test proving that peertube videos are correctly handled
6 years ago
William Pitcock
873938d223
tests: twitter api: activity view test: enable tesla mock
6 years ago
William Pitcock
9f48485f64
tests: mastodon api: add test verifying that peertube videos are correctly rendered
6 years ago
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
lambda
61a88a6757
Merge branch 'ci-test-fix' into 'develop'
...
SetUserSessionIdPlugTest: try again to fix random ci failures
See merge request pleroma/pleroma!579
6 years ago
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
Ivan Tashkinov
851db74f1c
[ #114 ] Fixed test.
6 years ago
Ivan Tashkinov
7cab7de9ff
[ #114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
...
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
6 years ago
Ivan Tashkinov
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
href
adbb265fc6
daaa8cd6
take two
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
Ivan Tashkinov
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
Ivan Tashkinov
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
kaniini
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
lain
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
Rin Toshaka
196d9c0fd0
Fix tests
6 years ago
rinpatch
8a67677d77
Add test
6 years ago
Ivan Tashkinov
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
href
daaa8cd66a
SetUserSessionIdPlugTest: try to fix random ci failures
6 years ago
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
lambda
7d9254fb4a
Merge branch 'fix-test' into 'develop'
...
Fix uploads test.
See merge request pleroma/pleroma!564
6 years ago
lain
52bda3b456
Fix uploads test.
6 years ago
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
lambda
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
lambda
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
6 years ago
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
lain
e4763cd459
Fix tagging problems for existing instances.
6 years ago
Ekaterina Vaartis
de981ac5a2
Alias Kocaptcha in the test
6 years ago
href
b12a904911
Integration tests for mastodon websocket
6 years ago
lambda
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
6 years ago
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
Ekaterina Vaartis
73576ab64e
Fix captcha tests
6 years ago
href
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
link0ff
7c235b8874
Add more Mix task tests in relay_test.exs and uploads_test.exs.
...
Rename test/tasks/user.exs to test/tasks/user_test.exs.
6 years ago
eal
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
vaartis
2e72d49e37
Rename captcha_test.ex to exs
6 years ago
link0ff
36f1af232a
Add tests for Mix tasks
6 years ago
Ekaterina Vaartis
c859cd1d61
Fix style
6 years ago
Ekaterina Vaartis
5f96c2d216
Add a test for kocaptcha
6 years ago
Ekaterina Vaartis
e8537208bd
Add a captcha mock for tests
6 years ago
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
Haelwenn (lanodan) Monnier
5af91020f8
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
6 years ago
href
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
raeno
9ff61ed793
Fix tests
...
Notice test has been failing due to missing placeholder in index.html
I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
Ivan Tashkinov
07e93f9940
[ #114 ] Improved tests.
6 years ago
Ivan Tashkinov
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
Ivan Tashkinov
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
Ivan Tashkinov
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
lambda
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
6 years ago
eal
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
eal
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
raeno
c5c3ad90d0
Fix tests. Remove oembed template
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
Ivan Tashkinov
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
lambda
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
6 years ago
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
lain
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
href
bdc8112e40
Media proxy: fix url encoding
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
abbf347dc7
[ #394 ] View tests fix.
6 years ago
Ivan Tashkinov
22830c8fc9
[ #394 ] Formatting fix.
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
kaniini
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
6 years ago
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
Vald
3c8ffe7ed3
resolved activity view test
6 years ago
Vald
028904c333
lint
6 years ago
Vald
911a877576
resolved api and controller test failures
6 years ago
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
Vald
743a09132b
linting
6 years ago
Vald
812b20d49f
resolved formatter_test failures
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Maksim Pechnikov
c524c50509
fix/273
6 years ago
Ivan Tashkinov
ba345e4c29
[ #210 ] Formatting fix.
6 years ago
Ivan Tashkinov
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
6 years ago
Ivan Tashkinov
53797d19c5
[ #210 ] Test update (replaced bang- with non-bang method).
6 years ago
William Pitcock
0f061bea0c
tests: add regression test for bug #408
6 years ago
Maksim Pechnikov
a9e3e387c9
add test
6 years ago
Ivan Tashkinov
44ab3dbe2c
[ #210 ] Refactoring.
6 years ago
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
Maksim Pechnikov
50e72f6c48
remove httpoison_mock
6 years ago
Maksim Pechnikov
dd8aee332c
formatting the code
6 years ago
Maksim Pechnikov
5c6d47614d
all tests passed
6 years ago
Maksim Pechnikov
a9e4a97586
update test
6 years ago
Maksim Pechnikov
7ec64ac33f
update test
6 years ago
Maksim Pechnikov
80bfdb4e7d
update test
6 years ago
Maksim Pechnikov
6cfdc11e32
update test
6 years ago
Maksim Pechnikov
c508d41c34
add http requests mock
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
William Pitcock
d6ab701a14
formatting
6 years ago
William Pitcock
419d4bd5e4
tests: add tests for Object.normalize()
6 years ago
William Pitcock
f0439617ef
tests: some minor cleanups
6 years ago
William Pitcock
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
6 years ago
William Pitcock
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
6 years ago
William Pitcock
fe000f82f8
tests: activitypub: fix broken test due to invalid child object
6 years ago
William Pitcock
f7e15d3257
tests: fix a lot of the remaining test failures
6 years ago
William Pitcock
4ca4c83871
tests: fix most remaining failures
6 years ago
William Pitcock
e8570758f9
twitterapi: fix remaining test failures
6 years ago
William Pitcock
6f5f589f73
test: fix mastodon api test failure
6 years ago
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
Maxim Filippov
8148943368
Format files
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
6be0ab1e55
Hide network in ap.
6 years ago
lain
91065e1968
Fix background updating / handling.
6 years ago
lain
f18b86fd5f
More fixes for Info schema.
6 years ago
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
1c67277c80
Fix admin api.
6 years ago
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
kaniini
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
href
253da275bd
Pleroma.Config.delete/1
6 years ago
href
65e7307d68
Upload: bring back base_url
6 years ago
href
1d537bc74f
remove eal
...
i like you eal don't take it personally<3
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
48b95a9b95
Assorted fixes.
6 years ago
lain
d407f662af
Fix TwitterApiController.
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
lain
6ac5d48575
More fixes
6 years ago
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
lain
e002858071
Fix ostatus test.
6 years ago
lain
3c61df6b9e
Webfinger fixes.
6 years ago
lain
5bd3b3a215
More and more fixes.
6 years ago
lain
badbe2656c
More fixes.
6 years ago
lain
f983c1d0c6
Fix CommonApi tests.
6 years ago
Haelwenn (lanodan) Monnier
cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
William Pitcock
5b3480d896
tests: fix up some more broken mastodon api testcases
6 years ago
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
6 years ago
William Pitcock
c196754b4d
mastodon api: account view: fix tests
6 years ago
lain
2887f4ff1d
Fix formatter tests.
6 years ago
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
6 years ago
eal
689b46efc8
RetryQueue: tiny refractor, add tests
6 years ago
lain
fbb70d25fe
Several twitter api fixes.
6 years ago
lain
40d9d2098c
Fix user updating from AP.
6 years ago
lain
fc3bcf335e
Fix following locked users.
6 years ago
lain
d5af41b577
Fix note count update.
6 years ago
lain
6f90ceb2ed
Fix follower count test.
6 years ago
lain
8e3d8bde04
Fix user deactivation test.
6 years ago
lain
5c8f07f0a8
Fix note counting.
6 years ago
lain
47d883d3ab
Fix User deactivation.
6 years ago
William Pitcock
f6be980f4f
activitypub: object view: avoid leaking private details
6 years ago
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
6 years ago
William Pitcock
e10f839e9b
tests: federator: fix formatting
6 years ago
William Pitcock
dfcfb184b1
activitypub: transmogrifier: make deletes secure
6 years ago
Haelwenn (lanodan) Monnier
52681f7fd0
Web.AdminAPI.AdminAPIControllerTest: New Test
6 years ago
Haelwenn (lanodan) Monnier
76bd80d462
test/plugs/user_is_admin_plug_test: New test
6 years ago
William Pitcock
b1a6e8d80d
test: add sanity tests for federator handling of AP docs
6 years ago
William Pitcock
55640c4804
tests: add a test to verify the general fake direction protection works in all cases
6 years ago
William Pitcock
dc1d8e13b4
tests: add a testcase for user collision
6 years ago
William Pitcock
1a940cb46e
tests: add tests for contain_origin_from_id()
6 years ago
William Pitcock
b483ae0a72
tests: add a second spoofing variant
6 years ago
William Pitcock
9c8adfb6ef
test: fix more test defects
6 years ago
William Pitcock
d9cb081f07
tests: add additional spoofing tests
6 years ago
William Pitcock
2ab8e28728
transmogrifier tests: fix defective spoofing test
6 years ago
William Pitcock
010fcb73d7
test: httpoison mock: add second spoofing activity test
6 years ago
lain
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
6 years ago
lambda
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
6 years ago
lain
e8d8c84f79
Add better test for user search functionlity.
6 years ago
AkiraFukushima
62944b47fb
Reset http security settings to fix plug test
6 years ago
lain
27aa136aac
Format.
6 years ago
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
lain
2cf40237ff
MastodonAPI: Add pagination to private messages.
6 years ago
scarlett
0ce5623134
Merge branch 'twitter-api-null-display-name' into 'develop'
...
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
6 years ago
scarlett
db78c72868
Twitter API: Add tests for nil names.
6 years ago
William Pitcock
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
William Pitcock
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
William Pitcock
54fdce9107
tests: add tests for CSPPlug
6 years ago
William Pitcock
69b8c0e299
tests: add test for internal data stripping
6 years ago
kaniini
c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
6 years ago
kaniini
99a8ef967e
Merge branch 'tests/prismo-url-map' into 'develop'
...
Test that prismo url-map transforms into a string
See merge request pleroma/pleroma!414
6 years ago
William Pitcock
1d9fcbf2ba
add missing prismo testcase data
6 years ago
William Pitcock
c9df011215
tests: add tests for new OStatus.is_representable? function
6 years ago
William Pitcock
dfc26d0fdd
tests: add testing for new notification behavior
6 years ago
William Pitcock
719a8a1f82
tests: flip testing to/cc for mentions
6 years ago
lambda
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
6 years ago
lain
34bd411781
Unify json ld header handling.
6 years ago
lain
3b02fd9fb7
Small refactor.
6 years ago
kaniini
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
6 years ago
kaniini
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
6 years ago
William Pitcock
d675b8a16f
tests: add tests for twitterapi endpoint
6 years ago
William Pitcock
50bf174651
tests: add tests for Notification.set_read_up_to()
6 years ago
href
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
6 years ago
kaniini
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
6 years ago
href
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
6 years ago
href
36ca3c1b3e
format
6 years ago
href
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
6 years ago
href
013f7ba8c1
Add federating plug & public tests
6 years ago
lain
2fedd93931
Fix formatting.
6 years ago
lain
81af7fd02d
Test for null-content activities.
6 years ago
lain
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
6 years ago
lain
45ebc8dd9a
Check for empty string in_reply_to ids.
6 years ago
Haelwenn (lanodan) Monnier
c5f26f3ce2
Test that prismo url-map transforms into a string
6 years ago
Lee Starnes
585b29337c
Ensure filters have a filter_id
6 years ago
lain
1e9ced5af4
Test Relay, switch to runtime configuration.
6 years ago
lain
9b77030d3c
Add basic configuration management module.
6 years ago
William Pitcock
2b3a40d038
object: split object_cache from user_cache
6 years ago
William Pitcock
2c092ed355
test: fixup test breakage caused by User.delete() harmonization
6 years ago
William Pitcock
21dafa7cd0
tests: add tests for User + cache interactions
6 years ago
William Pitcock
f55fc68f76
tests: add tests for object deletion
6 years ago
scarlett
b92e38d2d4
Add user reactivation task.
6 years ago
William Pitcock
2ac13061af
testsuite: formatting
6 years ago
William Pitcock
0d0c1dcf44
tests: add testsuite for broken thread filter
6 years ago
William Pitcock
b1d1f9bc27
tests: add test for user inbox
6 years ago
William Pitcock
6cfba7db8d
tests: twitterapi: add additional fields
6 years ago
William Pitcock
9563f3766d
tests: update for new in_reply_to_screen_name field
6 years ago
eal
5e9a0e2460
Fix some typos in the list test.
6 years ago
AkiraFukushima
a249cbf187
Add a test for List.get_lists_account_belongs
6 years ago
William Pitcock
958c5e02e8
tests: add a testcase for matching osada users in the formatter
6 years ago
Haelwenn (lanodan) Monnier
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
William Pitcock
ebc32045f0
test: add regression test for #316
6 years ago
William Pitcock
497814cbbb
test: update test for new html scrub policy
6 years ago
William Pitcock
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe
, reversing
changes made to 340ab3cb90
.
6 years ago
Haelwenn (lanodan) Monnier
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
6 years ago
Haelwenn
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
6 years ago
Haelwenn (lanodan) Monnier
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
6 years ago
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
William Pitcock
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
6 years ago
Haelwenn (lanodan) Monnier
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
6 years ago
Haelwenn (lanodan) Monnier
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg)
6 years ago
William Pitcock
85b59d07b6
test: add smoketests for the scrubbing policies
6 years ago
William Pitcock
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
William Pitcock
bd03644ca8
test: add tests for new User.html_filter_policy()
6 years ago
William Pitcock
200ab27e7a
test: add test proving that users are refreshed when stale
6 years ago
Haelwenn (lanodan) Monnier
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
shadowfacts
85b8590109
Update status_view_test.exs
6 years ago
William Pitcock
a4fe14de02
tests: break the cycle using pleroma.factory
6 years ago
William Pitcock
fc92bb28b4
tests: try breaking the cycle a different way
6 years ago
William Pitcock
33a5294fad
test: user enabled plug tests: fix circular reference
6 years ago
lambda
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
Martin Kühl
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
6 years ago
lain
d22af29bb4
Fix warning.
6 years ago
lain
44b094908c
Update legacy passwords automatically.
6 years ago
Martin Kühl
ff38ffd9f8
Fix the tests
6 years ago
lain
e601165426
Add UserEnabledPlug.
6 years ago
lain
5ce1ebb179
Add SetUserSessionIdPlug.
6 years ago
Haelwenn
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
lain
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
6 years ago
lain
32465b9939
Simplify AuthenticationPlug
6 years ago
lain
9a96c93be7
Add SessionAuthenticationPlug.
6 years ago
lain
a3f54fca4d
Add LegacyAuthenticationPlug
6 years ago
lain
3cf17dc402
Add EnsureAuthenticatedPlug
6 years ago
lain
faf5347748
Add UserFetcherPlug.
6 years ago
lain
42bd985e66
Add BasicAuthDecoderPlug
6 years ago
Moon Man
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
6 years ago
kaniini
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
6 years ago
William Pitcock
d3f6814feb
tests: add test for staffAccounts presence in nodeinfo
6 years ago
kaniini
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
6 years ago
kaniini
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
6 years ago
kaniini
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
6 years ago
William Pitcock
834515fb51
formatter: don't add XSS emoji
6 years ago
William Pitcock
303af9ba4c
tests: add regression tests
6 years ago
Martin Kühl
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
Will Pearson
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
Thurloat
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
lambda
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
William Pitcock
e7871ed05e
tests: add tests for evil HTML filtering
6 years ago
William Pitcock
9cac7c957c
test: add testcase proving lists system does not leak non-public posts
6 years ago
Henry Jameson
0f1c629d65
better solution, added test.
6 years ago
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters
6 years ago
Haelwenn (lanodan) Monnier
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
lambda
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
kaniini
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
6 years ago
William Pitcock
86dca39640
tests: fix formatting
6 years ago
William Pitcock
504a25f812
tests: add notification smoketests (ref #265 )
6 years ago
kaniini
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
William Pitcock
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
William Pitcock
a8bd120ea6
tests: formatting
6 years ago
William Pitcock
14d1187702
test: add testcase for formatter issue #163
6 years ago
William Pitcock
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
6 years ago
kaniini
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
kaniini
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
6 years ago
Haelwenn (lanodan) Monnier
74c74decf5
Basic peertube support.
6 years ago
ensra
2b5db840ee
attempt to add html validation to mastodon api test case
6 years ago
ensra
e883587cc3
this should be looking at the follower's bio, not the user's bio.
...
fixes test.
6 years ago
ensra
f533daffdb
sync bio sanitization code in tests
6 years ago
kaniini
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
6 years ago
kaniini
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
6 years ago
kaniini
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
6 years ago
kaniini
8dc715b30b
Merge branch 'fix/normalize-file-extension' into 'develop'
...
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
6 years ago
William Pitcock
8058443674
testsuite: add puckipedia test fixture
6 years ago
William Pitcock
b8560e5ed5
testsuite: formatting
6 years ago
William Pitcock
7fbcd4caaf
test: add kroeg fixtures
6 years ago
eal
92caa2632b
Use Image type for emoji icons.
6 years ago
eal
f9d13558c8
CommonAPI: add emoji to user source data on update
6 years ago
lambda
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
eal
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
eal
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
William Pitcock
3026177206
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
6 years ago
William Pitcock
aea23468c6
test: nickname is no longer a required field
6 years ago
Haelwenn (lanodan) Monnier
32a55e9695
[Pleroma.FormatterTest] Add test for XMPP link
6 years ago
Haelwenn (lanodan) Monnier
1a2255ef7e
[Pleroma.FormatterTest]: .add_links: Add a space before the dot
...
A dot is legal in the url, even at the end, so I moved it for the test
6 years ago
hakabahitoyo
9c1b6f11c5
improve test
6 years ago
hakabahitoyo
908cefd84a
debug
6 years ago
hakabahitoyo
9c2afb2e71
improve test
6 years ago
lambda
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
6 years ago
lambda
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
6 years ago
William Pitcock
18cac1e36b
test: mastodon attachments: update for added description field
6 years ago
William Pitcock
489453c246
tests: verify media description api support is working
6 years ago
Haelwenn (lanodan) Monnier
24b5a75d09
Add test for Plume Articles
6 years ago
William Pitcock
f1a29fc43c
test: ostatus controller: add AS2 fetching tests
6 years ago
William Pitcock
4fb64c1d86
testsuite: twitter api: add summary where necessary
6 years ago
lambda
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
6 years ago
lambda
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
6 years ago
William Pitcock
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
William Pitcock
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
6 years ago
William Pitcock
32211c4ada
tests: add default_scope where appropriate
6 years ago
lambda
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
6 years ago
Vivian Lim
6160a1b3c0
mix format
6 years ago
Vivian Lim
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
6 years ago
Vivian Lim
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
Haelwenn (lanodan) Monnier
359093d73b
Fake 2.4.0 API
6 years ago
Francis Dinh
082920044a
Normalize file extension for uploaded files
6 years ago
lambda
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
6 years ago
William Pitcock
590e8d5555
tests: fix a completely bogus mastodon api test
6 years ago
William Pitcock
3707a7fa42
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
6 years ago
William Pitcock
e9ed7eb963
tests: prove that the block code is properly destroying follow relationships
6 years ago
William Pitcock
a2c6778ce6
tests: add regression test for contentMap-only posts
6 years ago
Haelwenn (lanodan) Monnier
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
Francis Dinh
0a95b5594b
Add missing file extension if file does not have one
6 years ago
lambda
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
Francis Dinh
fc15f30a3c
fixup test
6 years ago
Francis Dinh
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
Henry Jameson
9c1cf1befb
formatting
6 years ago
Henry Jameson
f42ffbe9a8
Initial invites support + tests.
6 years ago
lambda
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
6 years ago
lambda
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
6 years ago
William Pitcock
c773f42ca4
tests: update twitterapi user view tests for new locked variable
6 years ago
William Pitcock
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
William Pitcock
d116af3bee
tests: add tests for /api/pleroma/friend_requests
6 years ago
William Pitcock
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
6 years ago
William Pitcock
a0c5b42e29
tests: assert the state prior to mutating it as well as afterward
6 years ago
William Pitcock
c99b9b9d92
testsuite: add mastodon api tests
6 years ago
lambda
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
6 years ago
William Pitcock
299ef74f2e
tests: add regression test for locking/unlocking account updates
6 years ago
Sir_Boops
3f0440ac3c
Dedupe uploads
6 years ago
lambda
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
6 years ago
William Pitcock
1620ec502c
testsuite: update fixture URIs that were http
6 years ago
D Anzorge
2cebaa7d3a
Add OAuth controller tests
...
Tests for Pleroma.Web.OAuth.OAuthController
6 years ago
eal
4856962434
MastoAPI: add domain blocking.
6 years ago
lain
8073af6e10
Better error handling for OstatusController.
6 years ago
eal
87566b6e2f
user.ex: add domain blocks.
6 years ago
lain
06439f64d0
Better error handling for ActivityPubController
6 years ago
lain
4856ba596f
Better error handling for MastodonApiController.
6 years ago
lain
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
lambda
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
6 years ago
eal
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
lain
349400c06a
Fix url guessing attacks.
6 years ago
eal
5d3fdbc082
MastoAPI: Add streaming for lists.
6 years ago
William Pitcock
f569b67cda
tests: update for html changes
6 years ago
lain
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
6 years ago
lain
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
lain
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
6 years ago
lain
0a6c897c94
Formatting.
6 years ago
lain
bfce29866f
Make Mastodon follow hack more explicit.
6 years ago
lain
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
6 years ago
William Pitcock
1db0dc3072
tests: add tests to verify the accept request is discarded if no follow activity could be found
6 years ago
William Pitcock
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
6 years ago
William Pitcock
1f3eb0f470
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
6 years ago
William Pitcock
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
6 years ago
William Pitcock
8d2ee70da1
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
6 years ago
lambda
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
lambda
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
6 years ago
lambda
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
6 years ago
eal
3dbd9809d4
MastoAPI: add lists.
6 years ago
lain
1cd6194dee
More efficient queries.
6 years ago
lain
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
6 years ago
lambda
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
6 years ago
Francis Dinh
72b93d13f8
Hook up block/unblock to TwitterAPI
6 years ago
Francis Dinh
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
6 years ago
csaurus
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
6 years ago
Syldexia
69aa7c213a
Fixed test
6 years ago
Syldexia
d0690622cd
Added endpoint for changing passwords
6 years ago
William Pitcock
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
6 years ago
Francis Dinh
d045b96f95
Add tests for incoming unfollow over OStatus
6 years ago
Francis Dinh
cc5373b846
Fix unblock handling
6 years ago
Francis Dinh
89c5de9096
Fix unfollows
6 years ago
Francis Dinh
56de0216ae
pass user to User.blocks?/2 instead of ap_id
6 years ago
Francis Dinh
1afd6d37bd
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
...
Fixed some conflicts in transmogrifier.ex
6 years ago
Thog
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
6 years ago
lain
413de8e4bc
More fixes.
6 years ago
lain
ff007af0c2
Return visilility in twitter api, too.
6 years ago
lain
434601a5c3
Return private / direct posts on user timelines, too.
6 years ago
lambda
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
6 years ago
Francis Dinh
d46393f6ef
Fix test for blocks
6 years ago
Francis Dinh
1e43de0f86
Formatting and add tests for blocks/unblocks
6 years ago
Thog
6f39ecc41b
Support Undo like activities ( Fix #139 )
6 years ago
Syldexia
d1366f8d46
Modified deleting an account to run as a task
6 years ago
lambda
7831b38705
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
...
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
6 years ago
lain
df95118c81
Fix linking problem.
6 years ago
William Pitcock
725b05d04a
run mix format
6 years ago
William Pitcock
6e8de2faae
run mix format
6 years ago
William Pitcock
4033ed6714
tests: add test for hubzilla follow activity too
6 years ago
William Pitcock
19c96c8a19
tests: add tests for Transmogrifier.maybe_fix_user_object()
6 years ago
William Pitcock
f32e19f668
webfinger: add tests
6 years ago
Francis Dinh
8d11bae0d5
Revert "Undo formatting in user.ex"
...
This reverts commit e6dc15b96c
.
6 years ago
Francis Dinh
e6dc15b96c
Undo formatting in user.ex
6 years ago
Francis Dinh
d8c842a771
Add support for incoming remote unfollows
6 years ago
lain
1d4bbec6b3
Fix User search.
...
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185 .
6 years ago
csaurus
d0ad13c12e
Add direct_note[_activity]_factory and a couple tests
6 years ago
csaurus
987a52cf6f
Post direct status test
6 years ago
Syldexia
98b36d359a
Fixed formatting and test
6 years ago
Syldexia
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
6 years ago
Syldexia
a16117225f
Added endpoint for user account deletion
6 years ago
lain
89954a2ce7
Fix format.
6 years ago
lain
c7a85de35c
Revert "Remove 'unlisted' handling for now."
...
This reverts commit 1027d1f696
.
6 years ago
lain
1027d1f696
Remove 'unlisted' handling for now.
...
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
6 years ago
lambda
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
6 years ago
lain
ec531ca281
Add test.
6 years ago
Francis Dinh
694e376954
Update test fixture
6 years ago
Francis Dinh
16b793656d
Add tests for unrepeats
6 years ago
Pierrick Brun
89603eda9e
do not create notification for yourself
6 years ago
lambda
6c2903d9a1
Merge branch 'feld-warnings' into 'develop'
...
Clean up warnings
See merge request pleroma/pleroma!144
6 years ago
lain
9810153aeb
Streamer: Don't send out stream events for blocked users.
6 years ago
lain
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
6 years ago
Mark Felder
ab4aa5720a
Fix a bunch of unused variable warnings
6 years ago
lain
90c4bed0af
Don't expire idempotency cache for five minutes.
6 years ago
lain
fcd3eca167
MastodonAPI: Support idempotency key.
6 years ago
Francis Dinh
8b4ee0ea51
Fix formatting
6 years ago
lain
bc215f5684
Fix format.
7 years ago
lambda
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
7 years ago
lambda
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
7 years ago
Wim Vanderbauwhede
6908f29e0a
Added a test (written by @andrewzah) for the MR
7 years ago
Francis Dinh
2d775bf1be
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
7 years ago
Francis Dinh
e981280fa7
Formatting fixes
7 years ago
Francis Dinh
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
Dashie
9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
7 years ago
Francis Dinh
8c0806539c
Embed announce activity data instead of linking to it
7 years ago
lain
0574df273c
Small cleanup.
7 years ago
lain
114ca9e069
Merge branch 'develop' into fix/note-count-not-updating
7 years ago
lain
0c221943ef
Formatter: Use proper escaping for links.
7 years ago
eal
22bfeac256
Update note count in ActivityPub.create.
7 years ago
lain
9e6ae44729
Formatting fixes.
7 years ago
Francis Dinh
f0798440de
Use correct activity for undo
7 years ago
Francis Dinh
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
lain
a61e8ac154
Formatting.
7 years ago
eal
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
7 years ago
Francis Dinh
7b4f55238e
Handle unrepeats via the TwitterAPI
7 years ago
Francis Dinh
687db1bc3a
Expose unannounce activity so that it can be tested
7 years ago
Francis Dinh
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
7 years ago
Francis Dinh
5b0d0b9ab2
Add unreblogging tests
7 years ago
eal
48380aeccc
ActivityPub.ex: do not return boosted statuses from blocked users.
7 years ago
Gian Sass
2de2e29df2
Oops
7 years ago
Gian Sass
3a5c0465eb
Add unit test for pinned statuses
7 years ago
lain
70bcdf32bd
Only search in public data for now.
...
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
7 years ago
lain
60f92e406c
Accept port number in urls.
7 years ago
lain
81600c94f4
Handle + in links.
7 years ago
lain
806550c921
Use user url in mention if we have it.
7 years ago
lain
b3b7ab5d9a
Load all users at once in timelines.
7 years ago
lain
360c51f1f5
Use context_ids directly if we have them.
7 years ago
lain
bc31bee7c4
Generates contexts and ids on insertion time.
7 years ago
lain
a4db3a732f
Pre-fetch conversation ids.
7 years ago
lain
0a14d155d6
Fail faster.
7 years ago
lain
1b57522bba
Fix some test stuff.
7 years ago
lain
2222e5599c
Don't fetch anything except ap_id for follower / following
...
collections.
Should speed up the queries because ecto doesn't have to parse the json.
7 years ago
lain
802736679c
Remove unused ActivityRepresenter module.
7 years ago
lain
e90f8f6c4b
TwApi ActivityView: Add delete activities.
7 years ago
lain
1f32ba052c
TwApi ActivityView: Add follows.
7 years ago
lain
4afbef39f4
Format the code.
7 years ago
lain
c1d529ee94
TwApi ActivityView: Add announces.
7 years ago
lain
1f1caab138
TwApi ActivityView: Add Like rendering.
7 years ago
lain
361016349f
Add ActivityViewTest.
7 years ago
lain
e30752bc79
Add basic activity view.
7 years ago
lain
37e5014d3e
Reduce OP fetching queries.
7 years ago
lain
ff7afe46b9
Don't try to fetch OP if none is there.
7 years ago
Francis Dinh
9556c8f6e7
Forgot to fix one of the links in a test
7 years ago
Francis Dinh
5ba2f4b6d8
Update tests to reflect hashtag link changes
7 years ago
William Pitcock
2aea3bc632
activitypub transmogrifier: rewrite incoming hashtags
7 years ago
lain
e3a81fe58f
Fetch the same data from json webfinger as from xml webfinger.
7 years ago
lain
eb7ce61ca5
Fix hashtags.
7 years ago
lain
5da2355e71
For outgoing objects, fake mastodon style ap id for ostatus.
7 years ago
lain
32ae918843
Clear caches on test.
7 years ago
William Pitcock
ff7afc0465
tests: webfinger: test quering a JSON response for activitypub actor URI
7 years ago
William Pitcock
8aa639a450
webfinger: support JSON output
7 years ago
lain
ec83175100
Use connection pools.
7 years ago
William Pitcock
0ee6e8af26
mastodon api tests: invalidate user cache prior to importing a test reply
...
This is needed to ensure the user cache does not throw nil when creating the mentions
list.
Signed-off-by: lain <lain@soykaf.club>
7 years ago
William Pitcock
59a76ea464
activitypub transmogrifier: rewrite non-http URLs using the object's external URL
...
Signed-off-by: lain <lain@soykaf.club>
7 years ago
lain
368e085144
Don't validate on missing public key.
7 years ago
lain
f29902a241
More signature debugging.
7 years ago
lain
611ca385de
Merge branch 'develop' into feature/activitypub
7 years ago
lain
a91adb146e
add test file.
7 years ago
lain
fcf1937a40
Correctly handle unlisted messages coming in through Ostatus.
7 years ago
lain
b82637f32d
Don't use special query for feed.
7 years ago
lain
d2ad99298e
Handle incoming deletes.
7 years ago
lain
e9de04b74b
Add support for outgoing update.
7 years ago
lain
f61fd00db5
Make likes and announces public.
7 years ago
lain
8a47974217
Fix specs.
7 years ago
lain
4ea2a41014
Fix more specs.
7 years ago
lain
d3b0167854
Fix salmon tests.
7 years ago
lain
4d13cc0dc6
Fix specs.
7 years ago
lain
8e7f63afde
Fix specs.
7 years ago
lain
e3629af4da
Handle remote update activities.
7 years ago
lain
b76de1ecd3
Some fixes to AP fetching.
7 years ago
lain
e5fcc51a06
Remove unneccesary subscriptions on update.
7 years ago
lain
fb02300234
Pleroma AP detection mechanism.
7 years ago
lain
01d5ef65fa
More fixes to user upgrading.
7 years ago
lain
aa79d64e0d
Correctly stitch mastodon -> ostatus replies.
7 years ago
lain
eb3f14da86
Missing test skeleton.
7 years ago
lain
37e406ae36
Get avatar and banner from AP users.
7 years ago
lain
4816b09fa7
Add user upgrade function.
7 years ago
Ekaterina Vaartis
ec07e087bc
Make user bio optional
7 years ago
lain
94db9ac4db
Merge branch 'develop' into feature/activitypub
7 years ago
lain
810cf8618f
ActivityPub: Fetch missing activities on reply.
7 years ago
lain
5bc810c452
Add moderator function.
7 years ago
lain
95f7e7e2d5
Add some more tests.
7 years ago
lain
297a2c7d3f
Ignore duplicate create activities.
7 years ago
lain
6b6ab592ab
AP: Fix incoming conversations.
7 years ago
lain
539340d914
Handle sensitive property.
7 years ago
lain
20e6190ead
Transmogrify outgoing nsfw.
7 years ago
lain
8ca66b5961
ActivityPub: Add conversation id.
7 years ago
lain
6ab0aba50a
Transmogrify outgoing hashtags.
7 years ago
lain
6046f10431
Actually fix incoming attachments.
7 years ago
lain
77c6c424a6
ActivityPub: Make fake Create activities for objects without one.
7 years ago
lain
fc9d361d17
Add mock.
7 years ago
lain
81ea359a7c
ActivityPub: Handle incoming announces.
7 years ago
lain
e3732ea3bc
Add test fixtures.
7 years ago
lain
5e36b750c1
ActivityPub: Fetch an object from an id.
7 years ago
lain
e1b12a7782
ActivityPub: Handle incoming likes.
7 years ago
lain
ab27c90c9f
ActivityPub: Handle attachments.
7 years ago
lain
fb7b926be3
Handle black name fields on incoming users.
7 years ago
lain
7b26443a76
ActivityPub: Send out Accept after Follow.
7 years ago
lain
e7b73359e3
ActivityPub: Partly handle incoming follows.
7 years ago
lain
5682e48a25
ActivityPub: tags -> tag.
7 years ago
lain
05ba6ca1b8
Do some transmogrifying for the output.
7 years ago
lain
5a371892a0
Fix specs.
7 years ago
lain
dea29d707c
Add post activity fixture.
7 years ago
lain
5454ec6a6c
ActivityPubController: Handle inbox data.
7 years ago
lain
ef0300889d
Transmogrifier: Handle basic notice creation.
7 years ago
lain
a15f572800
OstatusTest: Remove insert_or_update test (moved to User).
7 years ago
lain
ae26604378
ActivityPub: Refactor create function.
7 years ago
lain
0aa56a853b
UserTest: Move insert_or_update test.
7 years ago
lain
b331cb449a
Merge branch 'develop' into feature/activitypub
7 years ago
lain
1bc34de4df
Add missing support file.
7 years ago
lain
26ccb768d3
Make test output easier to read.
7 years ago
lain
33a5d0a238
Fix some test warnings.
7 years ago
lain
3c80d9b277
Fix spec.
7 years ago
lain
8cf97ee8e1
ActivityPub: Basic note federation with Mastodon.
7 years ago
lain
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
7 years ago
Roger Braun
ae1ec858f4
Basic AP user building.
7 years ago
Roger Braun
c1d26751e6
Mocks: Add mastodon user json example.
7 years ago
Roger Braun
52200998c9
Merge branch 'develop' into feature/activitypub
7 years ago
lambda
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
7 years ago
Hakaba Hitoyo
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
7 years ago
eal
29be70c008
Add remote following of local profiles.
7 years ago
eal
ab83e0de6d
TwitterAPI: Add is_local to user view.
7 years ago
Roger Braun
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
7 years ago
Roger Braun
4501094606
Make specs less breaky.
7 years ago
Roger Braun
1bb3ba02f3
Fix specs.
7 years ago
eal
b3e7d7ae6d
Fetch external profile in the background.
7 years ago
eal
80f6ac412a
Merge branch 'default-pictures' into 'develop'
...
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
7 years ago
eal
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
7 years ago
eal
6e1cb86166
Fix instance test.
7 years ago
Lain Iwakura
2a744cdff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Lain Iwakura
f1f79c0dca
Fix timelines in subway tooter.
7 years ago
lambda
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
7 years ago
Lain Iwakura
47887ac848
MastoAPI: Fix always-sensitive bugs.
7 years ago
eal
1969773fb4
Fix follower/following lists.
...
Add tests.
7 years ago
Lain Iwakura
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
7 years ago
eal
9223038319
Fix some more tests.
7 years ago
Lain Iwakura
e2e6365035
ActivityPub: Add controller tests.
7 years ago
Lain Iwakura
da005d3332
ActivityPub: Add Objects View.
7 years ago
eal
79b3397c17
Fix tests.
7 years ago
Roger Braun
c3bcafc51b
HTTPSig: Add method to validate conn
7 years ago
Roger Braun
30e9b22f96
Merge branch 'develop' into feature/activitypub
7 years ago
Roger Braun
d5a13c10ac
Merge branch 'feature/user_deletion' into develop
7 years ago
Lain Iwakura
bad499b3fd
Basic user deletion.
7 years ago
eal
a3e68f0233
Allow parentheses in links.
7 years ago
Lain Iwakura
6df6ad0b42
User deletion: Remove relationships.
7 years ago
Lain Iwakura
a78ae2a685
Don't follow deactivated users.
7 years ago
Lain Iwakura
b727ecc5e7
Add function to deactivate users.
7 years ago
Lain Iwakura
0ec5aeb8a7
Don't log in deactivated users.
7 years ago
Lain Iwakura
66c3813ea6
Add basic queue prioritization.
7 years ago
Lain Iwakura
e7c2472abd
Fix tests.
7 years ago
Roger Braun
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
7 years ago
Lain Iwakura
5637d163e6
MastodonAPI: Add proper user count.
7 years ago
Lain Iwakura
c680ae581d
Return xml notice at /notice path.
7 years ago
eal
1625021a9c
Merge branch 'fix/self-follow' into 'develop'
...
Dont include the user in their own follower count.
See merge request pleroma/pleroma!29
7 years ago
eal
3d29fc5462
Make /api/friends/ids test deterministic.
7 years ago
Roger Braun
747a68a075
Treat internal emoji like external.
7 years ago
eal
8d4e7b32c9
Ensure correct state in self-unfollow.
7 years ago
eal
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
7 years ago
eal
edc3e5bc30
Make users in tests follow themselves by default.
...
Also fix the semantics of all tests to match.
7 years ago
eal
4db5954786
Don't let the user unfollow their own account.
7 years ago
Roger Braun
40ca379357
Fix flakey test.
7 years ago
lambda
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
7 years ago
eal
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
7 years ago
eal
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
7 years ago
eal
66e78c3ec4
Escape HTML instead of discarding it.
7 years ago
Roger Braun
a743940463
MastoAPI: Implement all streaming functions.
7 years ago
Roger Braun
ced0d64d75
MastoAPI: Make attachment ids strings.
7 years ago
lambda
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
7 years ago
eal
f9828e578c
TwitterAPI: Add /users/show.
7 years ago
eal
3533bf7eac
TwitterAPI: Add /friends/ids.
7 years ago
eal
06c3ee3bac
Accept 1 as true.
7 years ago
eal
c84723b679
MastoAPI: Add media timelines.
7 years ago
Roger Braun
083cd169d2
MastoAPI: Fix repeat api bug.
...
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
7 years ago
lambda
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
7 years ago
lambda
efcf54dc02
Merge branch 'mastoapi-update-credentials' into 'develop'
...
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
7 years ago
eal
fc7483cb3c
MastoAPI: Add update credentials endpoint.
7 years ago
Roger Braun
a1923d20e8
MastoAPI: Fix reblog emojis.
7 years ago
Roger Braun
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun
6e9c22c0af
MastoAPI: Use string ids everywhere.
7 years ago
eal
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
7 years ago
Roger Braun
1b8ad9f731
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun
266d9c008d
MastoAPI: Fetch statuses in search.
7 years ago
lambda
2247d7580e
Merge branch 'fix-tootdon-image-uploads' into 'develop'
...
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
7 years ago
eal
e942e1e552
Correct mimetype on bad uploads.
7 years ago
Roger Braun
f1d27a5fbb
Add actor column to activities.
7 years ago
Roger Braun
41b8a76e96
Re-fetch user data on salmon decode error.
7 years ago
eal
f7fc048aeb
TwitterAPI user view: add follows_you.
7 years ago
eal
4656cb9b99
TwitterAPI user view: add blocks.
7 years ago
eal
6c0758e041
TwitterAPI: Add blocks.
7 years ago
lambda
d761b1543a
Merge branch 'authenticated-profile-fetching' into 'develop'
...
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
7 years ago
Roger Braun
7da978f3f5
Linkify fixes.
7 years ago
eal
f85566324e
Allow profile fetching for authenticated users only.
7 years ago
Roger Braun
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun
046bee34d3
Fix bug when no posts are in the db.
7 years ago
Roger Braun
c6b9b777da
MastoAPI: Add list of blocked users.
7 years ago
Roger Braun
5bf92e50be
MastoAPI: Add blocking.
7 years ago
Roger Braun
33beb51da4
MastoAPI: Add blocking to AccountView.
7 years ago
Roger Braun
867ac1e4f5
Handle nil cases.
7 years ago
Roger Braun
8ef58a266b
Don't return blocked users' activities in contexts.
7 years ago
Roger Braun
a47727adde
Don't return activities from blocked users.
7 years ago
Roger Braun
632da6c927
Don't create notifications if the user is blocked.
7 years ago
Roger Braun
6a5f087174
Add blocks to User.
7 years ago
Roger Braun
345ad870f7
Clean up user_test.exs.
7 years ago
Roger Braun
9be286a900
Handle empty terms / tags.
7 years ago
Roger Braun
6f05367325
Federate out content warnings.
7 years ago
Roger Braun
e014cc6ed8
Allow using cws in mastodon api.
7 years ago
Roger Braun
0c871e5c6e
Fix specs.
7 years ago
Roger Braun
44295dd49a
MastoAPI: Include CW.
7 years ago
Roger Braun
04217f52c9
TwitterAPI: Display cws.
7 years ago
Roger Braun
4cbf17dac6
Save cws in the activitypub data.
7 years ago
Roger Braun
4dcbb64f19
Avoid potentially slow count queries for user note count.
...
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
7 years ago
Roger Braun
968a546d4a
MastoAPI: Return id as string instead of integer.
7 years ago
Roger Braun
2f39bb6b43
Typo.
7 years ago
Roger Braun
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
7 years ago
Roger Braun
502cb38cd6
Move user search to User module.
7 years ago
eal
71f66bd458
Fix follow test semantics.
7 years ago
eal
c56d28f96c
Fix return type of /api/v1/follows
7 years ago
eal
8e94936553
Add tests.
7 years ago
Roger Braun
64bc38e009
MastoAPI: Add emoji output.
7 years ago
Roger Braun
b4f055b604
Don't reject already accepted subscriptions.
7 years ago
Roger Braun
6268b7e0eb
HTTP Signatures: Work with all test vectors.
7 years ago
Roger Braun
9cefbaf016
Start of HTTP Signatures.
7 years ago
Roger Braun
6000f61727
MastoAPI: Add repeats to statusview.
7 years ago
Roger Braun
422d0f324f
MastodonAPI: Add user favorites endpoint.
7 years ago
Roger Braun
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
7 years ago
Roger Braun
255a681782
TwitterAPI: Add tag timeline.
7 years ago
Roger Braun
003cb17b16
Add missing fixtures.
7 years ago
Roger Braun
7c82b82197
Make emoji configurable in files.
7 years ago
Roger Braun
959e993c7d
Apply incoming custom emoji.
7 years ago
Roger Braun
16b1fcd271
Handle incoming emoji.
7 years ago
Roger Braun
884006a9e9
Federate emoji out.
7 years ago
Roger Braun
79aeb219d8
Small emoji refactor.
7 years ago
Roger Braun
5d1f8dcd1c
TwitterAPI: Add search.
7 years ago
Roger Braun
0872f5f394
Add undocumented default user default settings.
7 years ago
Roger Braun
c36229c4aa
Add remote user fetching to search.
7 years ago
Roger Braun
9f0a2a714b
Add basic search.
7 years ago
Roger Braun
d659fcc195
MastoAPI: Fix date in account view.
7 years ago
Roger Braun
50409326a8
Refactor posting and make character limit configurable.
7 years ago
Roger Braun
3ca853fb61
MastoAPI: Follower-related changes
7 years ago
Roger Braun
fc85c9f086
Add tag timelines.
7 years ago
Roger Braun
a8701282d4
MastoAPI: fake out 'application' property.
7 years ago
Roger Braun
6258c6b6b3
MastoAPI: Also return text_url in attachments.
7 years ago
Roger Braun
7f3ce5c1a0
Cleanup.
7 years ago
Roger Braun
641c24cdd4
Add media upload endpoint.
7 years ago
Roger Braun
d168ef5a9e
MastoAPI: Add accounts getting.
7 years ago
Roger Braun
94be93aad0
Allign datetime format with mastodon.
7 years ago
Roger Braun
e6286152b9
Fix logic.
7 years ago
Roger Braun
49929321c7
Add relationships to masto api.
7 years ago
Roger Braun
1bc58230ee
Remove milliseconds from mastodon api response.
7 years ago
Roger Braun
b58b35bf56
Use hash of attachment url as id.
...
Pretty hacky, let's see if we can get away with this.
7 years ago
Roger Braun
44a650235b
MastoAPI: Remove domain ending from account name.
7 years ago
Roger Braun
61adf676d5
Add basic mastodon notification support.
7 years ago
Roger Braun
7616b202ea
Add user timelines to Masto Api.
7 years ago
Roger Braun
fc10875895
Add attachments to mastoapi statuses.
7 years ago
Roger Braun
e8975d06be
Add header image to masto api.
7 years ago
Roger Braun
d625d8db7d
Add unfav to Mastodon API.
7 years ago
Roger Braun
454dc18570
Add favoriting to Mastodon API.
7 years ago
Roger Braun
66e4c710d4
Add reblogging to MastodonAPI.
7 years ago
Roger Braun
4dc517a0bb
Add deletion to masto api.
7 years ago
Roger Braun
be04f725e9
Add more Mastodon API methods.
7 years ago
Roger Braun
2b7efff71b
Add Mastodon StatusView.
7 years ago
Roger Braun
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
7 years ago
Roger Braun
95cedd6000
Make auth tokens usable once and expire them.
7 years ago
Roger Braun
d1c10ad2fb
Fix specs.
7 years ago
Roger Braun
3438a120cc
Don't delete new delete activity...
7 years ago
Roger Braun
fcf3128a56
Add TwAPI representer for deletes.
7 years ago
Roger Braun
2348b272e0
Create deletes activities for incoming deletes.
7 years ago
Roger Braun
5db535c0b1
Add delete to ActivityPub.
7 years ago
Roger Braun
540dfb4617
Add delete activity representer.
7 years ago