lambda
|
29c9812789
|
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
|
2017-12-18 22:44:15 +00:00 |
|
eal
|
1969773fb4
|
Fix follower/following lists.
Add tests.
|
2017-12-18 16:37:26 +02:00 |
|
eal
|
fdfb508259
|
Run follow import in the background.
|
2017-12-12 21:04:41 +02:00 |
|
eal
|
d89193a8d7
|
Allow uploading a file for follow import.
|
2017-12-12 21:03:28 +02:00 |
|
eal
|
39ccfdc084
|
Add follow import.
|
2017-12-12 18:35:23 +02:00 |
|
href
|
72f7baa654
|
Merge remote-tracking branch 'upstream/develop' into media-proxy
|
2017-12-05 14:12:15 +01:00 |
|
Lain Iwakura
|
5c40986120
|
Basic backend chat.
|
2017-12-04 19:10:15 +01:00 |
|
href
|
5f35fdcf5d
|
media proxy: good enough wip
|
2017-11-28 20:50:34 +01:00 |
|
Thog
|
59770c3f5c
|
Fix all compilation warnings
|
2017-11-19 02:22:07 +01:00 |
|
eal
|
31e4277ba5
|
Don't add summary if empty.
|
2017-11-18 15:25:22 +02:00 |
|
lambda
|
1cca544e20
|
Merge branch 'twitterapi-bitlbee' into 'develop'
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
|
2017-11-14 16:47:54 +00:00 |
|
eal
|
f9828e578c
|
TwitterAPI: Add /users/show.
|
2017-11-14 17:34:48 +02:00 |
|
eal
|
22bbe27115
|
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
|
2017-11-14 16:10:13 +02:00 |
|
eal
|
3533bf7eac
|
TwitterAPI: Add /friends/ids.
|
2017-11-14 16:04:58 +02:00 |
|
lambda
|
77e272df2d
|
Merge branch 'following-you-in-user-view' into 'develop'
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
|
2017-11-08 17:57:13 +00:00 |
|
eal
|
f7fc048aeb
|
TwitterAPI user view: add follows_you.
|
2017-11-08 19:13:03 +02:00 |
|
Roger Braun
|
d2430d5007
|
Look through whole db for user timelines.
They already have an index that's good enough.
|
2017-11-08 17:25:18 +01:00 |
|
eal
|
4656cb9b99
|
TwitterAPI user view: add blocks.
|
2017-11-08 13:02:00 +02:00 |
|
eal
|
6c0758e041
|
TwitterAPI: Add blocks.
|
2017-11-08 00:04:53 +02:00 |
|
eal
|
c6210183e1
|
Add mastodon API endpoint for custom emoji.
|
2017-11-07 21:55:01 +02:00 |
|
Roger Braun
|
d89a7a0b34
|
TwitterAPI: Add blocking to fetches.
|
2017-11-02 22:50:42 +01:00 |
|
Roger Braun
|
04217f52c9
|
TwitterAPI: Display cws.
|
2017-10-31 17:43:37 +01:00 |
|
eal
|
fe7804e42d
|
Add an API endpoint for emoji.
|
2017-10-19 22:51:56 +03:00 |
|
Roger Braun
|
6af164f27b
|
Add password reset.
|
2017-10-19 17:37:24 +02:00 |
|
Roger Braun
|
d009a79df5
|
TwitterAPI: Return proper error.
Fixes #32.
|
2017-09-17 14:37:00 +02:00 |
|
Roger Braun
|
6877d7aaad
|
Fix typo.
|
2017-09-17 12:08:50 +02:00 |
|
Roger Braun
|
b7b3e3f263
|
Use inserted_at as sort in search.
|
2017-09-17 11:32:24 +02:00 |
|
Roger Braun
|
959e993c7d
|
Apply incoming custom emoji.
|
2017-09-16 16:40:20 +02:00 |
|
Roger Braun
|
884006a9e9
|
Federate emoji out.
|
2017-09-16 16:14:23 +02:00 |
|
Roger Braun
|
c17c8ce36d
|
Don't check limit twice in TwitterAPIController.
|
2017-09-16 15:47:07 +02:00 |
|
Roger Braun
|
03952a2760
|
Sort by updated_at
the updated_at column isn't indexed, so postgres won't take the wrong index.
|
2017-09-16 14:51:55 +02:00 |
|
Roger Braun
|
f039c9c19a
|
Don't specify order in results for now.
|
2017-09-16 14:40:53 +02:00 |
|
Roger Braun
|
5d1f8dcd1c
|
TwitterAPI: Add search.
|
2017-09-16 14:33:47 +02:00 |
|
Roger Braun
|
c20530e708
|
Add configuration option for registrations.
|
2017-09-15 14:39:32 +02:00 |
|
Roger Braun
|
50409326a8
|
Refactor posting and make character limit configurable.
|
2017-09-15 14:17:36 +02:00 |
|
Roger Braun
|
d625d8db7d
|
Add unfav to Mastodon API.
|
2017-09-09 18:30:02 +02:00 |
|
Roger Braun
|
454dc18570
|
Add favoriting to Mastodon API.
|
2017-09-09 18:09:37 +02:00 |
|
Roger Braun
|
66e4c710d4
|
Add reblogging to MastodonAPI.
|
2017-09-09 17:48:57 +02:00 |
|
Roger Braun
|
4dc517a0bb
|
Add deletion to masto api.
|
2017-09-09 13:56:51 +02:00 |
|
Roger Braun
|
2652d9e4ed
|
Slight cleanup.
|
2017-09-07 08:58:10 +02:00 |
|
Roger Braun
|
632e1f7943
|
Add delete to TwAPI representer correctly.
|
2017-09-04 20:48:29 +02:00 |
|
Roger Braun
|
1f9a5272e1
|
Add delete to TwAPI.
|
2017-09-04 20:48:14 +02:00 |
|
Roger Braun
|
fcf3128a56
|
Add TwAPI representer for deletes.
|
2017-09-04 20:03:28 +02:00 |
|
Roger Braun
|
6c3a0ffae4
|
Add banner and background updating.
|
2017-08-29 17:18:33 +02:00 |
|
Roger Braun
|
5142a8efbb
|
Add profile update.
|
2017-08-29 15:14:00 +02:00 |
|
Roger Braun
|
171ef33cbb
|
More sensible attachment names.
|
2017-08-28 19:17:38 +02:00 |
|
Roger Braun
|
67bfa19b35
|
Set twitter-style possibly_sensitive boolena.
|
2017-08-24 16:27:37 +02:00 |
|
Roger Braun
|
5dc278b1a6
|
Add activity_type to twitter api output.
|
2017-08-24 16:18:26 +02:00 |
|
Roger Braun
|
d95b78c72f
|
Remove email from mastoinfo.
|
2017-08-24 14:19:54 +02:00 |
|
Roger Braun
|
d1f86ad69f
|
Basic masto-style info.
|
2017-08-24 14:15:16 +02:00 |
|
Roger Braun
|
8a97bebc53
|
More meta info fixes.
|
2017-08-24 14:07:05 +02:00 |
|
Roger Braun
|
7ccdebe180
|
Small meta info fixes.
|
2017-08-24 13:36:28 +02:00 |
|
Roger Braun
|
1a001588e8
|
Don't break on empty mentions.
|
2017-08-24 12:54:01 +02:00 |
|
Roger Braun
|
7d34cec58d
|
escape attachment urls on creation.
|
2017-08-09 16:55:18 +02:00 |
|
Roger Braun
|
00b722430f
|
Revert "Close br tags."
This reverts commit 2eba8e74cc.
|
2017-07-31 13:27:38 +02:00 |
|
Roger Braun
|
19e8421947
|
Revert "Wrap in <p>."
This reverts commit c81d0b6f89.
|
2017-07-31 13:27:29 +02:00 |
|
Roger Braun
|
3063e3b440
|
Revert "Remove newlines completely so mastodon doesn't bug out."
This reverts commit 0ca3ab7b59.
|
2017-07-31 13:27:19 +02:00 |
|
Roger Braun
|
0ca3ab7b59
|
Remove newlines completely so mastodon doesn't bug out.
|
2017-07-31 13:06:31 +02:00 |
|
Roger Braun
|
c81d0b6f89
|
Wrap in <p>.
|
2017-07-31 12:16:44 +02:00 |
|
Roger Braun
|
2eba8e74cc
|
Close br tags.
|
2017-07-31 10:46:29 +02:00 |
|
Roger Braun
|
72ca58c540
|
Save follower count and note count in user.
|
2017-07-22 17:42:15 +02:00 |
|
Roger Braun
|
a027b0027c
|
Add friends endpoint.
|
2017-07-20 20:35:30 +02:00 |
|
Roger Braun
|
94a394e3a8
|
Add followers endpoint.
|
2017-07-20 20:29:15 +02:00 |
|
Roger Braun
|
140f72725d
|
Use follower address in user entry.
|
2017-07-19 19:06:49 +02:00 |
|
Roger Braun
|
7e9647b146
|
Fix undo activity.
|
2017-07-08 11:17:35 +02:00 |
|
Roger Braun
|
e343c0c9c4
|
Add way to update most recent notification id.
|
2017-07-02 15:01:59 +02:00 |
|
Roger Braun
|
9bdea19d83
|
For non-create activities, grab the create activity to fav/rt
|
2017-06-30 16:59:54 +02:00 |
|
Roger Braun
|
cd522d2139
|
Also fetch posts by id in fav/rts.
|
2017-06-30 16:53:25 +02:00 |
|
Roger Braun
|
1c074efeaf
|
Add external links to twapi.
|
2017-06-25 12:07:08 +02:00 |
|
dtluna
|
08e53df91e
|
Move util functions to UtilController
|
2017-06-20 17:55:57 +03:00 |
|
Roger Braun
|
1e6491ec96
|
Merge branch 'develop' into refactor/user-view
|
2017-06-20 11:49:41 +02:00 |
|
Roger Braun
|
af49c11193
|
Work around upserting problems in context mapping.
|
2017-06-20 09:50:22 +02:00 |
|
dtluna
|
069daf644d
|
Replace UserRepresenter with UserView
|
2017-06-20 00:12:37 +03:00 |
|
Roger Braun
|
45c751985e
|
Move finmojis to representation.
|
2017-06-19 18:06:58 +02:00 |
|
Roger Braun
|
66b4fee80e
|
Add finmoji.
|
2017-06-19 17:51:43 +02:00 |
|
Roger Braun
|
fa82822932
|
Revert "Add invisible tags to TwAPI output."
This reverts commit a92a9dce94.
|
2017-06-18 18:59:13 +02:00 |
|
Roger Braun
|
d00571ff75
|
Fetch user feed on externalprofile request.
This is so we always have something to show.
|
2017-06-18 17:20:39 +02:00 |
|
Roger Braun
|
fafb765c48
|
Output tags list in TwAPI.
|
2017-06-18 14:43:44 +02:00 |
|
Roger Braun
|
8feec8d390
|
Strip unsafe html on output in TwAPI.
|
2017-06-18 13:40:35 +02:00 |
|
Roger Braun
|
7b41e103e1
|
Remove html from user bios on display.
This is mainly to fix problems of bios coming from mastodong.
|
2017-06-18 13:17:35 +02:00 |
|
Roger Braun
|
83c657afa5
|
Do some basic escaping.
|
2017-06-14 14:46:18 +02:00 |
|
Roger Braun
|
1af9c77736
|
Move mention parsing to Formatter module.
|
2017-06-14 13:58:56 +02:00 |
|
Roger Braun
|
eb18b9ebba
|
Enable user timelines.
|
2017-06-12 17:12:55 +02:00 |
|
Roger Braun
|
00c032783d
|
Fix NaN statuses per day.
|
2017-06-05 15:47:37 +02:00 |
|
Roger Braun
|
c7fdd1b7ff
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
|
2017-06-01 11:24:03 +02:00 |
|
Roger Braun
|
c6aa60c829
|
Shorten names in links.
|
2017-05-30 14:26:31 +02:00 |
|
Roger Braun
|
4854a604ef
|
Extract note handler.
|
2017-05-20 13:41:33 +02:00 |
|
Roger Braun
|
48f9df2391
|
Keep newlines around.
|
2017-05-18 16:41:16 +02:00 |
|
Roger Braun
|
a92a9dce94
|
Add invisible tags to TwAPI output.
|
2017-05-18 16:24:41 +02:00 |
|
Roger Braun
|
0da6ade619
|
Save tags in object.
|
2017-05-18 15:16:49 +02:00 |
|
Roger Braun
|
9033bfffd2
|
Twitter API refactoring.
|
2017-05-17 18:00:20 +02:00 |
|
Roger Braun
|
70024632ba
|
AP refactoring.
|
2017-05-16 18:19:04 +02:00 |
|
Roger Braun
|
423194520e
|
Fix mention replacing.
|
2017-05-15 18:25:21 +02:00 |
|
Roger Braun
|
04544da8f1
|
Fetch user on externalprofile if we don't know him
|
2017-05-12 18:50:47 +02:00 |
|
Roger Braun
|
36448d6483
|
Add externalprofile to TwAPI.
|
2017-05-10 18:44:57 +02:00 |
|
Roger Braun
|
71362acb93
|
Quick fix for database filling.
|
2017-05-09 00:20:05 +02:00 |
|
Roger Braun
|
1418d72749
|
Add class=attachment to attachment links.
|
2017-05-08 20:12:36 +02:00 |
|
Roger Braun
|
b9da7d3219
|
typo.
|
2017-05-07 20:30:34 +02:00 |
|
Roger Braun
|
7303786160
|
Add some twapi fixes.
|
2017-05-07 20:20:53 +02:00 |
|
Roger Braun
|
b403ea4d2b
|
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
|
2017-05-07 19:28:23 +02:00 |
|
Roger Braun
|
a41aa4e489
|
Federate follow salmons.
|
2017-05-07 14:45:37 +02:00 |
|
Roger Braun
|
95ab0dc3c5
|
Add conversation ids to twapi announce representer.
|
2017-05-07 12:46:21 +02:00 |
|
Roger Braun
|
7269c51f3a
|
Some refactoring.
|
2017-05-05 12:07:38 +02:00 |
|
Roger Braun
|
c48c381e90
|
Merge branch 'develop' into dtluna/pleroma-refactor/1
|
2017-05-05 11:46:59 +02:00 |
|
Roger Braun
|
33c803d6da
|
Add attachment link to posts.
|
2017-05-02 18:25:39 +02:00 |
|
Roger Braun
|
16f8406eb6
|
Add statusnet_profile_url to the TwAPI.
|
2017-05-02 14:36:04 +02:00 |
|
Roger Braun
|
32a95d73da
|
Add twkn timeline.
|
2017-05-02 14:12:43 +02:00 |
|
Roger Braun
|
3cb518270a
|
Remove superfluous transaction.
|
2017-05-01 16:15:21 +02:00 |
|
Roger Braun
|
f169de3454
|
Cache objects in dev and prod.
|
2017-05-01 16:12:20 +02:00 |
|
Roger Braun
|
09f7ed4214
|
Don't set statusnetConversationIds on replies anymore.
|
2017-04-30 14:26:29 +02:00 |
|
Roger Braun
|
379caca01d
|
Wrap context creation in transaction.
|
2017-04-30 13:58:40 +02:00 |
|
Roger Braun
|
4c8111c334
|
Use conversation mapping objects to get / retrieve context from TwAPI.
|
2017-04-30 13:53:26 +02:00 |
|
Roger Braun
|
ffc604a2c2
|
Use cache for user info data.
Later these should be persisted in the user.
|
2017-04-30 10:04:54 +02:00 |
|
dtluna
|
a9b2ad1759
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
|
2017-04-28 16:06:57 +03:00 |
|
dtluna
|
6cf7c13228
|
Refactor code to comply with credo suggestions
|
2017-04-27 16:18:50 +03:00 |
|
Roger Braun
|
e8882ab3da
|
Merge branch 'develop' into feature/incoming_ostatus
|
2017-04-26 09:18:49 +02:00 |
|
dtluna
|
c3655d1c47
|
Remove unnecessary status_update definition
|
2017-04-25 19:47:16 +03:00 |
|
Roger Braun
|
b438ea24ee
|
Add ostatus conversation as context.
|
2017-04-25 17:45:34 +02:00 |
|
Roger Braun
|
6c5f5e18ec
|
Even more refactoring.
|
2017-04-25 17:36:53 +02:00 |
|
Roger Braun
|
4771962a5d
|
More refactoring.
|
2017-04-25 17:32:36 +02:00 |
|
Roger Braun
|
ef4190b3ab
|
Clean up status create method.
|
2017-04-25 17:26:05 +02:00 |
|
Roger Braun
|
ab0114fbaa
|
Return salmon path for users, basic incoming salmon handling.
|
2017-04-24 18:46:34 +02:00 |
|
dtluna
|
42105497ca
|
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
|
2017-04-24 14:17:23 +03:00 |
|
dtluna
|
5b6070ec40
|
Deny whitespace statuses
|
2017-04-24 12:09:11 +03:00 |
|
dtluna
|
f723b23691
|
Add error response to self-repeats
|
2017-04-24 01:11:38 +03:00 |
|
dtluna
|
6b6bc9435c
|
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
|
2017-04-24 01:05:02 +03:00 |
|
dtluna
|
1e3791877c
|
Add error response on empty status
|
2017-04-23 19:08:25 +03:00 |
|
lambadalambda
|
a3b9741a62
|
Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop'
Follow and unfollow using screen_name
See merge request !9
|
2017-04-23 10:26:27 -04:00 |
|
Roger Braun
|
a2b79ce7d1
|
Add outgoin federation to twitter api.
Doesn't really belong there, find a different place for it. Should
federate on every activity insertion.
|
2017-04-22 12:08:20 +02:00 |
|
dtluna
|
28b203d08f
|
Add Undo of Follow Activity insertion
|
2017-04-21 19:54:21 +03:00 |
|
Roger Braun
|
1c00eb4a90
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
|
2017-04-21 18:42:28 +02:00 |
|
dtluna
|
a9b3f99d48
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name
|
2017-04-21 18:36:03 +03:00 |
|
Roger Braun
|
9afc672009
|
Quick fix for activities without 'to'.
|
2017-04-21 01:01:58 +02:00 |
|
Roger Braun
|
1e88f102c4
|
Fix specs, add some user info.
|
2017-04-21 00:51:09 +02:00 |
|
dtluna
|
3a56d7318f
|
Add statuses/mentions endpoint
|
2017-04-20 15:18:54 +03:00 |
|
dtluna
|
b248fc7dfb
|
Refactor unfollow/2
|
2017-04-20 10:57:37 +03:00 |
|
dtluna
|
01901d9835
|
Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
|
2017-04-20 10:46:27 +03:00 |
|
dtluna
|
d952b6cd7b
|
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
|
2017-04-20 10:39:18 +03:00 |
|
lambadalambda
|
eda742c78b
|
Merge branch 'feature/user-timeline' into 'develop'
Feature/user timeline
See merge request !8
|
2017-04-19 05:50:24 -04:00 |
|
Roger Braun
|
36e883cd4b
|
Add basic Ostatus user representer.
|
2017-04-17 14:12:36 +02:00 |
|
lambadalambda
|
ac9817bdb0
|
Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
Add error messages for repeated follows and unfollows
See merge request !7
|
2017-04-17 05:46:59 -04:00 |
|
dtluna
|
ef5033d7a7
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
|
2017-04-16 17:18:34 +03:00 |
|
dtluna
|
f6547f7b7f
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
|
2017-04-16 17:13:42 +03:00 |
|
dtluna
|
82914e1e4d
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
|
2017-04-16 17:12:28 +03:00 |
|
dtluna
|
85bd480be3
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
|
2017-04-16 17:10:25 +03:00 |
|
dtluna
|
5229b01944
|
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
|
2017-04-16 17:08:17 +03:00 |
|
Roger Braun
|
eb9358c8d6
|
Add basic Avatar updating code.
|
2017-04-16 16:06:19 +02:00 |
|
dtluna
|
63f04b314d
|
Fix typo
|
2017-04-16 17:05:48 +03:00 |
|
dtluna
|
4b4ece2c74
|
Add user timeline fetching without credentials
|
2017-04-16 16:44:30 +03:00 |
|
Roger Braun
|
03a9c11d25
|
Display the users avatar if he has one set.
|
2017-04-16 15:40:50 +02:00 |