ensra
|
e883587cc3
|
this should be looking at the follower's bio, not the user's bio.
fixes test.
|
2018-08-21 15:25:21 +01:00 |
|
ensra
|
f533daffdb
|
sync bio sanitization code in tests
|
2018-08-21 15:24:06 +01:00 |
|
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
|
2018-08-16 15:41:16 +00:00 |
|
kaniini
|
5fbb14f5ec
|
Merge branch 'bugfix/federation-kroeg' into 'develop'
fix federation with kroeg
See merge request pleroma/pleroma!272
|
2018-08-16 15:20:15 +00:00 |
|
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
|
2018-08-16 15:19:46 +00:00 |
|
kaniini
|
8dc715b30b
|
Merge branch 'fix/normalize-file-extension' into 'develop'
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
|
2018-08-16 15:17:17 +00:00 |
|
William Pitcock
|
8058443674
|
testsuite: add puckipedia test fixture
|
2018-08-16 15:10:57 +00:00 |
|
William Pitcock
|
b8560e5ed5
|
testsuite: formatting
|
2018-08-14 17:15:33 +00:00 |
|
William Pitcock
|
7fbcd4caaf
|
test: add kroeg fixtures
|
2018-08-14 17:09:17 +00:00 |
|
eal
|
92caa2632b
|
Use Image type for emoji icons.
|
2018-08-13 16:21:18 +03:00 |
|
eal
|
f9d13558c8
|
CommonAPI: add emoji to user source data on update
|
2018-08-13 15:27:20 +03:00 |
|
lambda
|
13440a80e1
|
Merge branch 'feature/invites' into 'develop'
Invites
Closes #108
See merge request pleroma/pleroma!208
|
2018-08-12 12:04:15 +00:00 |
|
eal
|
ed9738e031
|
Add tests for emoji in user profiles
Also use the correct field in TwitterAPI...
|
2018-08-08 09:24:50 +03:00 |
|
eal
|
cee63ad3f7
|
TwitterAPI user view: add screen_name_html and description_html.
|
2018-08-08 08:38:25 +03:00 |
|
William Pitcock
|
3026177206
|
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
|
2018-08-06 11:29:03 +00:00 |
|
William Pitcock
|
aea23468c6
|
test: nickname is no longer a required field
|
2018-08-06 08:46:06 +00:00 |
|
Haelwenn (lanodan) Monnier
|
32a55e9695
|
[Pleroma.FormatterTest] Add test for XMPP link
|
2018-07-30 22:01:48 +02:00 |
|
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
|
2018-07-30 22:01:48 +02:00 |
|
hakabahitoyo
|
9c1b6f11c5
|
improve test
|
2018-07-21 02:57:56 +09:00 |
|
hakabahitoyo
|
908cefd84a
|
debug
|
2018-07-21 02:19:20 +09:00 |
|
hakabahitoyo
|
9c2afb2e71
|
improve test
|
2018-07-21 01:44:35 +09:00 |
|
lambda
|
41b0ecef95
|
Merge branch 'tests/plume' into 'develop'
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
|
2018-07-19 07:35:34 +00:00 |
|
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
|
2018-07-19 07:31:33 +00:00 |
|
William Pitcock
|
18cac1e36b
|
test: mastodon attachments: update for added description field
|
2018-07-17 03:40:48 +00:00 |
|
William Pitcock
|
489453c246
|
tests: verify media description api support is working
|
2018-07-17 03:40:47 +00:00 |
|
Haelwenn (lanodan) Monnier
|
24b5a75d09
|
Add test for Plume Articles
|
2018-07-12 23:08:28 +02:00 |
|
William Pitcock
|
f1a29fc43c
|
test: ostatus controller: add AS2 fetching tests
|
2018-07-12 20:32:56 +00:00 |
|
William Pitcock
|
4fb64c1d86
|
testsuite: twitter api: add summary where necessary
|
2018-07-12 16:12:25 +00:00 |
|
lambda
|
fe4387077a
|
Merge branch 'feature/default-scope' into 'develop'
default scope setting
See merge request pleroma/pleroma!239
|
2018-07-12 05:59:12 +00:00 |
|
lambda
|
4a922305af
|
Merge branch 'feature/article-support' into 'develop'
article support (plume, etc)
See merge request pleroma/pleroma!240
|
2018-07-12 05:58:39 +00:00 |
|
William Pitcock
|
8546551257
|
activitypub: switch to using x509 representation for public keys instead of pkcs#1
|
2018-07-12 03:30:22 +00:00 |
|
William Pitcock
|
66819ea784
|
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
|
2018-06-27 13:38:07 +00:00 |
|
William Pitcock
|
32211c4ada
|
tests: add default_scope where appropriate
|
2018-06-27 13:17:07 +00:00 |
|
lambda
|
fc012491a5
|
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
|
2018-06-25 08:45:42 +00:00 |
|
Vivian Lim
|
6160a1b3c0
|
mix format
|
2018-06-24 15:24:41 -07:00 |
|
Vivian Lim
|
1299bccc7d
|
return unquoted empty array from /api/qvitter/mutes.json
|
2018-06-23 23:20:30 -07:00 |
|
Vivian Lim
|
6316003946
|
fixes- found that TwitterAPI.Controller adds .json suffix already
|
2018-06-23 23:05:54 -07:00 |
|
Haelwenn (lanodan) Monnier
|
359093d73b
|
Fake 2.4.0 API
|
2018-06-23 16:12:57 +02:00 |
|
Francis Dinh
|
082920044a
|
Normalize file extension for uploaded files
|
2018-06-21 14:04:12 -04:00 |
|
lambda
|
be800d7936
|
Merge branch 'bugfix/block-follow-relationships' into 'develop'
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
|
2018-06-19 09:42:45 +00:00 |
|
William Pitcock
|
590e8d5555
|
tests: fix a completely bogus mastodon api test
|
2018-06-19 08:53:54 +00:00 |
|
William Pitcock
|
3707a7fa42
|
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
|
2018-06-19 00:59:28 +00:00 |
|
William Pitcock
|
e9ed7eb963
|
tests: prove that the block code is properly destroying follow relationships
|
2018-06-19 00:59:27 +00:00 |
|
William Pitcock
|
a2c6778ce6
|
tests: add regression test for contentMap-only posts
|
2018-06-18 22:14:51 +00:00 |
|
Haelwenn (lanodan) Monnier
|
72c2915ecd
|
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
|
2018-06-15 22:14:17 +02:00 |
|
Francis Dinh
|
0a95b5594b
|
Add missing file extension if file does not have one
|
2018-06-14 12:16:34 -04:00 |
|
lambda
|
8c7fdcb31b
|
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
|
2018-06-14 07:19:36 +00:00 |
|
Francis Dinh
|
fc15f30a3c
|
fixup test
|
2018-06-13 21:45:27 -04:00 |
|
Francis Dinh
|
1555c66650
|
Add unretweet TwAPI endpoint and cleanup AP.unannounce
|
2018-06-13 21:33:36 -04:00 |
|
Henry Jameson
|
9c1cf1befb
|
formatting
|
2018-06-12 15:01:40 +03:00 |
|
Henry Jameson
|
f42ffbe9a8
|
Initial invites support + tests.
|
2018-06-12 14:55:16 +03:00 |
|
lambda
|
3f42806b1b
|
Merge branch 'develop' into 'develop'
Dedupe uploads
See merge request pleroma/pleroma!115
|
2018-06-12 08:26:26 +00:00 |
|
lambda
|
564c73ab24
|
Merge branch 'feature/list-streaming' into 'develop'
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
|
2018-06-12 07:19:45 +00:00 |
|
William Pitcock
|
c773f42ca4
|
tests: update twitterapi user view tests for new locked variable
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
f8e0942745
|
twitter api: add approve/deny endpoints
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
d116af3bee
|
tests: add tests for /api/pleroma/friend_requests
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
993312cdb3
|
twitterapi: add profile setting for locked/unlocked accounts
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
a0c5b42e29
|
tests: assert the state prior to mutating it as well as afterward
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
c99b9b9d92
|
testsuite: add mastodon api tests
|
2018-06-11 22:15:53 +00:00 |
|
lambda
|
7f79b467b1
|
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
|
2018-06-11 11:19:45 +00:00 |
|
William Pitcock
|
299ef74f2e
|
tests: add regression test for locking/unlocking account updates
|
2018-06-08 02:52:34 +00:00 |
|
Sir_Boops
|
3f0440ac3c
|
Dedupe uploads
|
2018-06-06 13:25:44 -06:00 |
|
lambda
|
0a0c6bf394
|
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
webfinger robustness improvements
See merge request pleroma/pleroma!195
|
2018-06-06 16:44:44 +00:00 |
|
William Pitcock
|
1620ec502c
|
testsuite: update fixture URIs that were http
|
2018-06-06 16:36:58 +00:00 |
|
D Anzorge
|
2cebaa7d3a
|
Add OAuth controller tests
Tests for Pleroma.Web.OAuth.OAuthController
|
2018-06-06 03:18:11 +02:00 |
|
eal
|
4856962434
|
MastoAPI: add domain blocking.
|
2018-06-03 22:21:23 +03:00 |
|
lain
|
8073af6e10
|
Better error handling for OstatusController.
|
2018-06-03 21:04:44 +02:00 |
|
eal
|
87566b6e2f
|
user.ex: add domain blocks.
|
2018-06-03 22:01:37 +03:00 |
|
lain
|
06439f64d0
|
Better error handling for ActivityPubController
|
2018-06-03 19:58:59 +02:00 |
|
lain
|
4856ba596f
|
Better error handling for MastodonApiController.
|
2018-06-03 19:28:11 +02:00 |
|
lain
|
0f70e83e8c
|
Better error handling in TwitterApiController.
|
2018-06-03 19:11:22 +02:00 |
|
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
|
2018-06-01 08:51:04 +00:00 |
|
eal
|
935e544e19
|
TwitterAPI: fix "Follows you" being shown for the wrong user.
|
2018-05-31 15:27:42 +03:00 |
|
lain
|
349400c06a
|
Fix url guessing attacks.
|
2018-05-30 20:00:27 +02:00 |
|
eal
|
5d3fdbc082
|
MastoAPI: Add streaming for lists.
|
2018-05-30 16:48:59 +03:00 |
|
William Pitcock
|
f569b67cda
|
tests: update for html changes
|
2018-05-27 13:03:34 +00:00 |
|
lain
|
841ee8e3e4
|
Simplify DM query.
Should also use indexes better.
|
2018-05-26 16:25:32 +02:00 |
|
lain
|
4b3ec53514
|
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
|
2018-05-26 16:00:59 +02:00 |
|
lain
|
745072b2cc
|
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
|
2018-05-26 15:15:52 +02:00 |
|
lain
|
0a6c897c94
|
Formatting.
|
2018-05-26 15:11:50 +02:00 |
|
lain
|
bfce29866f
|
Make Mastodon follow hack more explicit.
|
2018-05-26 15:07:21 +02:00 |
|
lain
|
3839a11ef5
|
Don't treat remote accepts/rejects as local.
Also, use specialized functions to get safe data.
|
2018-05-26 14:07:46 +02:00 |
|
William Pitcock
|
1db0dc3072
|
tests: add tests to verify the accept request is discarded if no follow activity could be found
|
2018-05-26 11:20:53 +00:00 |
|
William Pitcock
|
7cf3cf77cf
|
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
|
2018-05-25 12:53:12 +00:00 |
|
William Pitcock
|
1f3eb0f470
|
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
|
2018-05-25 06:12:30 +00:00 |
|
William Pitcock
|
1d88abf2d4
|
user: do not allow refollowing somebody who has blocked a user
|
2018-05-25 03:18:35 +00:00 |
|
William Pitcock
|
8d2ee70da1
|
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
|
2018-05-25 03:18:34 +00:00 |
|
lambda
|
f3a71f2986
|
Merge branch 'feature/lists' into 'develop'
Mastodon List API
See merge request pleroma/pleroma!138
|
2018-05-24 20:22:43 +00:00 |
|
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
|
2018-05-24 19:52:24 +00:00 |
|
lambda
|
c41012053a
|
Merge branch 'feature/change-password' into 'develop'
Feature/change password
See merge request pleroma/pleroma!166
|
2018-05-24 17:16:37 +00:00 |
|
eal
|
3dbd9809d4
|
MastoAPI: add lists.
|
2018-05-24 15:34:39 +03:00 |
|
lain
|
1cd6194dee
|
More efficient queries.
|
2018-05-24 12:44:26 +02:00 |
|
lain
|
0b5bc62b33
|
Don't save double tags in AP objects we create
This crashed Mastodon workers.
|
2018-05-23 17:25:24 +02:00 |
|
lambda
|
06c97f211f
|
Merge branch 'feature/deps-migration' into 'develop'
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
|
2018-05-23 09:03:11 +00:00 |
|
Francis Dinh
|
72b93d13f8
|
Hook up block/unblock to TwitterAPI
|
2018-05-22 05:41:17 -04:00 |
|
Francis Dinh
|
b2c6ae7d82
|
Hook up unfollow and (un)block to MastoAPI + tests
|
2018-05-22 04:27:40 -04:00 |
|
csaurus
|
4fd9df100f
|
Merge branch 'develop' into feature/mstdn-direct-api
|
2018-05-21 20:19:37 -04:00 |
|
Syldexia
|
69aa7c213a
|
Fixed test
|
2018-05-21 23:06:03 +01:00 |
|
Syldexia
|
d0690622cd
|
Added endpoint for changing passwords
|
2018-05-21 23:06:03 +01:00 |
|
William Pitcock
|
75cfd9d34d
|
webfinger: fix finding the XRD uri for statusnet instances
|
2018-05-21 12:41:31 +00:00 |
|
Francis Dinh
|
d045b96f95
|
Add tests for incoming unfollow over OStatus
|
2018-05-21 05:11:13 -04:00 |
|
Francis Dinh
|
cc5373b846
|
Fix unblock handling
|
2018-05-21 05:00:58 -04:00 |
|
Francis Dinh
|
89c5de9096
|
Fix unfollows
|
2018-05-20 21:01:14 -04:00 |
|
Francis Dinh
|
56de0216ae
|
pass user to User.blocks?/2 instead of ap_id
|
2018-05-20 19:45:05 -04:00 |
|
Francis Dinh
|
1afd6d37bd
|
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
|
2018-05-20 19:17:15 -04:00 |
|
Thog
|
e55c6f311b
|
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
|
2018-05-20 20:08:40 +02:00 |
|
lain
|
413de8e4bc
|
More fixes.
|
2018-05-20 19:26:09 +02:00 |
|
lain
|
ff007af0c2
|
Return visilility in twitter api, too.
|
2018-05-20 18:01:24 +02:00 |
|
lain
|
434601a5c3
|
Return private / direct posts on user timelines, too.
|
2018-05-20 16:15:18 +02:00 |
|
lambda
|
8b0c222b43
|
Merge branch 'feature/account-deletion' into 'develop'
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
|
2018-05-20 10:57:19 +00:00 |
|
Francis Dinh
|
d46393f6ef
|
Fix test for blocks
|
2018-05-20 02:15:56 -04:00 |
|
Francis Dinh
|
1e43de0f86
|
Formatting and add tests for blocks/unblocks
|
2018-05-19 21:23:52 -04:00 |
|
Thog
|
6f39ecc41b
|
Support Undo like activities (Fix #139)
|
2018-05-19 22:14:15 +02:00 |
|
Syldexia
|
d1366f8d46
|
Modified deleting an account to run as a task
|
2018-05-19 13:35:49 +01:00 |
|
lambda
|
7831b38705
|
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
|
2018-05-19 09:31:08 +00:00 |
|
lain
|
df95118c81
|
Fix linking problem.
|
2018-05-19 11:27:14 +02:00 |
|
William Pitcock
|
725b05d04a
|
run mix format
|
2018-05-19 08:48:15 +00:00 |
|
William Pitcock
|
6e8de2faae
|
run mix format
|
2018-05-19 08:37:04 +00:00 |
|
William Pitcock
|
4033ed6714
|
tests: add test for hubzilla follow activity too
|
2018-05-19 03:28:32 -05:00 |
|
William Pitcock
|
19c96c8a19
|
tests: add tests for Transmogrifier.maybe_fix_user_object()
|
2018-05-19 03:28:30 -05:00 |
|
William Pitcock
|
f32e19f668
|
webfinger: add tests
|
2018-05-19 01:28:27 -05:00 |
|
Francis Dinh
|
8d11bae0d5
|
Revert "Undo formatting in user.ex"
This reverts commit e6dc15b96c .
|
2018-05-17 23:55:00 -04:00 |
|
Francis Dinh
|
e6dc15b96c
|
Undo formatting in user.ex
|
2018-05-17 23:53:34 -04:00 |
|
Francis Dinh
|
d8c842a771
|
Add support for incoming remote unfollows
|
2018-05-17 22:15:57 -04:00 |
|
lain
|
1d4bbec6b3
|
Fix User search.
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.
|
2018-05-16 17:55:20 +02:00 |
|
csaurus
|
d0ad13c12e
|
Add direct_note[_activity]_factory and a couple tests
|
2018-05-14 21:54:25 -04:00 |
|
csaurus
|
987a52cf6f
|
Post direct status test
|
2018-05-13 21:21:42 -04:00 |
|
Syldexia
|
98b36d359a
|
Fixed formatting and test
|
2018-05-13 15:43:42 +01:00 |
|
Syldexia
|
5bfb7b4ce6
|
Moved account deletion stuff to somewhere that hopefully makes more sense
|
2018-05-13 14:36:02 +01:00 |
|
Syldexia
|
a16117225f
|
Added endpoint for user account deletion
|
2018-05-13 14:35:48 +01:00 |
|
lain
|
89954a2ce7
|
Fix format.
|
2018-05-13 13:02:24 +02:00 |
|
lain
|
c7a85de35c
|
Revert "Remove 'unlisted' handling for now."
This reverts commit 1027d1f696 .
|
2018-05-13 12:38:13 +02:00 |
|
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.
|
2018-05-13 12:07:11 +02:00 |
|
lambda
|
aeff2d6474
|
Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
|
2018-05-13 09:32:29 +00:00 |
|
lain
|
ec531ca281
|
Add test.
|
2018-05-13 11:18:48 +02:00 |
|
Francis Dinh
|
694e376954
|
Update test fixture
|
2018-05-12 11:10:49 -04:00 |
|
Francis Dinh
|
16b793656d
|
Add tests for unrepeats
|
2018-05-11 15:30:47 -04:00 |
|
Pierrick Brun
|
89603eda9e
|
do not create notification for yourself
|
2018-05-11 11:31:17 +02:00 |
|
lambda
|
6c2903d9a1
|
Merge branch 'feld-warnings' into 'develop'
Clean up warnings
See merge request pleroma/pleroma!144
|
2018-05-06 18:42:31 +00:00 |
|
lain
|
9810153aeb
|
Streamer: Don't send out stream events for blocked users.
|
2018-05-05 13:40:47 +02:00 |
|
lain
|
c464355d1a
|
Idempotency: Use special cache, keep for 6 hours.
|
2018-05-05 11:15:57 +02:00 |
|
Mark Felder
|
ab4aa5720a
|
Fix a bunch of unused variable warnings
|
2018-05-04 20:59:01 +00:00 |
|
lain
|
90c4bed0af
|
Don't expire idempotency cache for five minutes.
|
2018-05-04 21:15:39 +02:00 |
|
lain
|
fcd3eca167
|
MastodonAPI: Support idempotency key.
|
2018-05-04 20:30:29 +02:00 |
|
Francis Dinh
|
8b4ee0ea51
|
Fix formatting
|
2018-05-04 03:19:48 -04:00 |
|
lain
|
bc215f5684
|
Fix format.
|
2018-04-29 11:28:26 +02:00 |
|
lambda
|
b7584edcea
|
Merge branch 'patch-bio' into 'develop'
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
|
2018-04-29 09:26:47 +00:00 |
|
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
|
2018-04-28 13:49:12 +00:00 |
|
Wim Vanderbauwhede
|
6908f29e0a
|
Added a test (written by @andrewzah) for the MR
|
2018-04-28 12:01:43 +01:00 |
|
Francis Dinh
|
2d775bf1be
|
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
|
2018-04-25 01:58:50 -04:00 |
|