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.
6 years ago
lambda
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
6 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
6 years ago
Wim Vanderbauwhede
6908f29e0a
Added a test (written by @andrewzah) for the MR
6 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