Basix/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
3893 commits 3 branches 72 tags 293 MiB
Commit graph

1265 commits

Author SHA1 Message Date
eugenijm
035eaeb9b8 Allow to configure visibility for admin and moderator badges 2019-02-06 06:18:05 +03:00
eugenijm
398c81f9c8 Add is_admin and is_moderator boolean fields to the user view 2019-02-06 02:10:06 +03:00
William Pitcock
73e6a1f1dd test: twitterapi: fix another possible test failure case 2019-02-05 20:08:16 +00:00
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
 2019-02-05 18:56:59 +00:00
William Pitcock
c4d317ccb6 test: twitterapi: fix the test breakage for real 2019-02-05 18:49:02 +00:00
Maxim Filippov
16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) 2019-02-03 21:55:04 +03:00
lambda
69a38644bc Merge branch '589-fix-cache' into 'develop' 
Resolve "Update object cache on favs/boosts"

Closes #589

See merge request pleroma/pleroma!764
 2019-02-03 18:19:40 +00:00
lain
e61f0be951 Unbreak all the tests. 2019-02-03 18:54:39 +01:00
lain
505a084058 Still do caching in tests. 2019-02-03 18:28:14 +01:00
Ivan Tashkinov
3913b0196e [#582] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified. 
Added tests.
 2019-02-03 13:28:13 +03:00
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`).
 2019-02-03 12:41:27 +03:00
kaniini
486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'" 
This reverts merge request !733
 2019-02-01 20:22:58 +00:00
href
7e384a2425 Merge branch 'develop' into 'develop' 
Use nodeinfo 2.1

See merge request pleroma/pleroma!753
 2019-02-01 19:18:46 +00:00
Luna
e8c7be38fc add tests for nodeinfo 2.0 compat and 2.1's new field 2019-02-01 14:33:14 -03:00
kaniini
0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop' 
Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma!733
 2019-02-01 17:05:29 +00:00
href
b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop' 
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
 2019-02-01 09:14:35 +00:00
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
 2019-02-01 03:55:10 -03:00
href
308b35ebe2
User.follow_all: ensure its stays unique 2019-01-31 18:17:44 +01:00
William Pitcock
106475f265 test: http mocks: formatting 2019-01-31 16:30:56 +00:00
William Pitcock
3f5b784596 test: rich media: parser: add malformed data regression test 2019-01-31 16:19:53 +00:00
William Pitcock
4e76f9fde1 test: add malformed OGP data fixture 2019-01-31 16:12:35 +00:00
lambda
a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'" 
This reverts merge request !682
 2019-01-31 12:16:23 +00:00
kaniini
4d3655c479 Merge branch 'spc-fix-3' into 'develop' 
Spc fix 3

See merge request pleroma/pleroma!682
 2019-01-31 11:29:29 +00:00
Haelwenn
00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop' 
Features/glitch soc frontend

See merge request pleroma/pleroma!192
 2019-01-31 10:16:11 +00:00
lain
c53b96a024 Fix specs. 2019-01-30 19:45:31 +01:00
lain
47ec690c54 Use race-condition free mass follow. 2019-01-30 19:33:25 +01:00
kaniini
d03a116654 Merge branch 'hj-happiness-improvement' into 'develop' 
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
 2019-01-29 13:54:10 +00:00
Ivan Tashkinov
92753b0cd9 [#534] Made federation push sender be determined basing on content instead of referer header. Updated tests. 2019-01-29 13:12:28 +03:00
Haelwenn
ebb3496386 Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop' 
Rich Media support, part 2.

See merge request pleroma/pleroma!719
 2019-01-29 05:11:08 +00:00
William Pitcock
61d6715714 rich media: oembed: return data in the same format as the other parsers 2019-01-28 21:13:25 +00:00
Maxim Filippov
3e968f9ef2 Format 2019-01-28 21:40:08 +03:00
Maxim Filippov
50d6183893 Split hide_network into hide_followers & hide_followings 2019-01-28 21:40:08 +03:00
Ivan Tashkinov
d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
Ivan Tashkinov
1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. 2019-01-28 15:25:06 +03:00
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.
 2019-01-28 13:07:12 +01:00
lain
1825118fd4 Correctly handle invalid credentials on auth login. 
Closes #407
 2019-01-28 11:41:47 +01:00
William Pitcock
339c26e12b test: add status posting with OGP link preview test 2019-01-28 06:19:00 +00:00
William Pitcock
6096846f5f API: kill /api/rich_media/parse endpoint 2019-01-28 05:53:17 +00:00
William Pitcock
020b3b29d9 test: update twitterapi tests 2019-01-28 05:53:17 +00:00
William Pitcock
364cf5369b test: update mastodon status view tests 2019-01-28 05:53:17 +00:00
William Pitcock
132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data 2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
lain
2e277dd4ad Fix objects. 2019-01-27 21:03:15 +01:00
kaniini
5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop' 
MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
 2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
 2019-01-27 10:33:22 +01:00
kaniini
155a884300 Merge branch 'flake-from-int' into 'develop' 
Flake: support integers in from_string/1

See merge request pleroma/pleroma!715
 2019-01-26 16:17:50 +00:00
href
d6015338c8
Flake: support integers in from_string/1 
Some previously issued stateless tokens have integer ids in them.
 2019-01-26 16:58:23 +01:00
William Pitcock
1f7843b9b8 mastodon api: use OGP uri instead of page_url for deducing domain name, fix test 2019-01-26 15:24:16 +00:00
Haelwenn (lanodan) Monnier
3f64379b13 Web.MastodonAPI.MastodonAPIController: Add Rich-Media support 2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
d9f3af477d Move definitions of RichMedia fixtures to test/support/http_request_mock.ex 2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null 2019-01-26 04:23:52 +01:00
Ivan Tashkinov
d99650270b [#534] Federation reachability filtering tests. 2019-01-25 20:38:54 +03:00
lain
aa8ddfdbe2 SPC fixes: Fix activities. 2019-01-25 18:14:48 +01:00
rinpatch
a45a903480 Fix OGP provider tests 2019-01-25 10:51:06 +03:00
rinpatch
3a5b3c5a3a Merge remote-tracking branch 'pl/develop' into oembed_provider 2019-01-25 10:40:51 +03:00
kaniini
4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop' 
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
 2019-01-25 05:19:32 +00:00
kaniini
c9b418e547 Merge branch 'develop' into 'oembed_provider' 
# Conflicts:
#   lib/pleroma/activity.ex
 2019-01-25 05:00:47 +00:00
kaniini
4df71cd88b Merge branch 'classic-flakeids' into 'develop' 
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
 2019-01-25 04:59:06 +00:00
Maxim Filippov
9274cabe01 Use correct logic to determine "attentions" list 2019-01-24 23:30:43 +03:00
William Pitcock
13d72826df test: add anti-followbot policy tests 2019-01-24 09:50:40 +00:00
Maxim Filippov
4333fea1dc Send "hide_network" in user_view 2019-01-23 19:47:51 +03:00
lain
2de208817c Merge branch 'develop' into rename/pleroma_activity_consistency 2019-01-23 13:05:58 +01:00
lain
e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
href
422e60ad76
2019 2019-01-23 11:26:35 +01:00
href
9d63b27dcd
Test FlakeID old id compat & Ecto type 2019-01-23 11:26:34 +01:00
href
28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
Ivan Tashkinov
34d59e4008 [#502] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test. 2019-01-22 17:12:53 +03:00
lain
762fafe738 Fix buggy test. 2019-01-21 17:54:11 +01:00
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
 2019-01-21 13:03:32 +00:00
lambda
69454c8345 Merge branch 'feature/dm-sanity' into 'develop' 
DM sanitization

See merge request pleroma/pleroma!458
 2019-01-21 12:35:10 +00:00
Ivan Tashkinov
789a9843da [#530] Fixed test. 2019-01-21 14:30:01 +03:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1 2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1 2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1 2019-01-21 07:49:59 +01:00
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
 2019-01-20 23:06:21 +00:00
lain
cf1f35a93a Send delete event over Mastodon streaming api 
Closes #116
 2019-01-20 13:00:46 +01:00
lambda
501fba33d6 Merge branch 'add-custom-emoji-test' into 'develop' 
Add a test to ensure #39 is fixed.

See merge request pleroma/pleroma!687
 2019-01-20 10:58:19 +00:00
lain
be0fb5dec4 Add a test to ensure #39 is fixed. 2019-01-20 11:48:53 +01:00
lambda
f3045a179e Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop' 
I1t/pleroma 477 user search improvements

See merge request pleroma/pleroma!685
 2019-01-20 10:24:05 +00:00
William Pitcock
cf3099231d test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility 2019-01-20 02:28:28 +00:00
William Pitcock
21ac35fcc0 tests: add tests for DM sanitizer 2019-01-20 02:27:48 +00:00
William Pitcock
8d06be35e0 activitypub: utils: add determine_explicit_mentions() and tests 2019-01-20 02:27:48 +00:00
kaniini
42612b1c8d Merge branch 'bugfix/improve-boost-targeting' into 'develop' 
improve handling of non-public Announces

See merge request pleroma/pleroma!681
 2019-01-19 23:44:08 +00:00
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
 2019-01-19 07:36:58 +00:00
Maxim Filippov
0a97badddd Format 2019-01-19 04:26:52 +03:00
Maxim Filippov
651a1d64b5 Add current user to mentioned 2019-01-19 04:25:15 +03:00
William Pitcock
31517bec12 test: add regression test for to/cc clobbering 2019-01-18 22:32:01 +00:00
Maxim Filippov
e116e55cab Add actor to recipients 2019-01-18 22:40:52 +03:00
lain
5d4d51e6dc Add fixes for SPC users. 2019-01-18 19:25:37 +01:00
rinpatch
74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
rinpatch
7bc6208b2f Fix ostatus test 2019-01-18 10:35:52 +03:00
Ivan Tashkinov
ed8f55ab8e [#477] User: FTS and trigram search results mixing (to handle misspelled requests). 2019-01-18 10:35:45 +03:00
rinpatch
1b1af4798a Use object instead of activity for metadata 2019-01-18 09:32:52 +03:00
Ivan Tashkinov
65bb9b2fba [#491] Made full nicknames be preserved in user links text only in Bio. 2019-01-18 09:30:16 +03:00
rinpatch
64143d8040 Fix object id in OpenGraph test 2019-01-17 22:57:24 +03:00
Ivan Tashkinov
954dc4a4ad [#502] Fixed user_count in /api/v1/instance to include only active local users. 2019-01-17 19:16:02 +03:00