| 
								
								
									 Roger Braun | 678dd4c8ec | Use desc id to sort instead of desc inserted_at Should mean the same and is indexed. | 2017-09-17 11:16:08 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7c82b82197 | Make emoji configurable in files. | 2017-09-16 16:49:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 959e993c7d | Apply incoming custom emoji. | 2017-09-16 16:40:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 16b1fcd271 | Handle incoming emoji. | 2017-09-16 16:27:48 +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 | 44693c100d | Federate banners out. | 2017-09-16 13:44:08 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 0fbf1911f5 | Banners are objects. | 2017-09-16 13:24:15 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | abac96f41d | Update banner from remote accounts. | 2017-09-16 13:16:54 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 0872f5f394 | Add undocumented default user default settings. | 2017-09-16 11:52:33 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5602293690 | Fix callback state. | 2017-09-16 11:37:55 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c36229c4aa | Add remote user fetching to search. | 2017-09-16 11:26:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 73bdfd6c2b | Set search config to 'english'. | 2017-09-16 10:50:43 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9f0a2a714b | Add basic search. | 2017-09-16 10:42:24 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d659fcc195 | MastoAPI: Fix date in account view. | 2017-09-15 17:50: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 | ac2893a945 | Add instance config options. | 2017-09-15 10:26:28 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 3aaf6608c6 | MastoAPI: Set user id on replies. | 2017-09-15 08:49:31 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f445a1b376 | Don't die on fetching problems. | 2017-09-15 08:18:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 3ca853fb61 | MastoAPI: Follower-related changes | 2017-09-14 18:30:05 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fc85c9f086 | Add tag timelines. | 2017-09-14 13:22:09 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b0363e8055 | MastoAPI: Add favourited_by/reblogged_by. | 2017-09-14 09:50:49 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ac3f32da7e | Preserve state in oauth | 2017-09-14 09:29:51 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a8701282d4 | MastoAPI: fake out 'application' property. | 2017-09-14 09:14:08 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6258c6b6b3 | MastoAPI: Also return text_url in attachments. | 2017-09-14 08:38:48 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 641c24cdd4 | Add media upload endpoint. | 2017-09-14 08:08:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 3184939055 | Ensure non-null bio. | 2017-09-13 17:45:59 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d168ef5a9e | MastoAPI: Add accounts getting. | 2017-09-13 17:36:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ad5001828e | Oh no! More datetime fixes! | 2017-09-13 17:18:08 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 14b4029b1d | Reparse time to ensure correct format. | 2017-09-13 16:38:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 94be93aad0 | Allign datetime format with mastodon. | 2017-09-13 16:26:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d2faee01ee | Return iso8601 date. | 2017-09-13 16:09:57 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e6286152b9 | Fix logic. | 2017-09-13 16:05:39 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 49929321c7 | Add relationships to masto api. | 2017-09-13 15:55:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f03524805f | Try host-meta call over https. | 2017-09-13 11:59:56 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 07b694814e | Optimize conversation fetching. | 2017-09-12 13:48:48 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1bc58230ee | Remove milliseconds from mastodon api response. | 2017-09-12 13:31:17 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7331733d30 | Use signed integer as attachment id. | 2017-09-12 11:43:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b58b35bf56 | Use hash of attachment url as id. Pretty hacky, let's see if we can get away with this. | 2017-09-12 11:28:12 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 44a650235b | MastoAPI: Remove domain ending from account name. | 2017-09-12 09:34:39 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f1d9f2f6cd | MastoAPI: More link headers. | 2017-09-12 09:06:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 0df4a0f26d | Add parentheses. | 2017-09-12 08:53:21 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 02f824f9d5 | MastoAPI: Add link headers to home timeline | 2017-09-12 08:51:56 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | cd6cba2f67 | log ostatus handling errors. | 2017-09-11 21:50:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f0d41a3abf | Merge branch 'develop' into oauth2 | 2017-09-11 20:54:44 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 464c33e9a1 | Add follow notifications. | 2017-09-11 20:53:11 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 3bad294058 | Add reblogs to notifications. | 2017-09-11 20:43:25 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | bcce3e5dd2 | Add favorites to notifications. | 2017-09-11 20:41:05 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 61adf676d5 | Add basic mastodon notification support. | 2017-09-11 18:53:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7616b202ea | Add user timelines to Masto Api. | 2017-09-10 17:49:13 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b8912ff954 | Fix masto api context. | 2017-09-10 17:20:53 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 8672d4d12b | Add context to mastodonAPI. | 2017-09-10 15:00:13 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fc10875895 | Add attachments to mastoapi statuses. | 2017-09-10 11:51:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 96473dfac0 | Reverse mastodon timeline data. | 2017-09-10 10:49:15 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e8975d06be | Add header image to masto api. | 2017-09-10 10:37:34 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d66d69c3b4 | Small hack to make notifications return empty for now. | 2017-09-09 19:19:13 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5fe9e4dd3f | Do oauth redirect. | 2017-09-09 19:03:57 +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 | be04f725e9 | Add more Mastodon API methods. | 2017-09-09 13:15:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 59dd240c08 | Use token exchange method. | 2017-09-09 12:10:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2b7efff71b | Add Mastodon StatusView. | 2017-09-09 12:10:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c6bdc5960c | Test for Mastodon AccountView Handles users and mentions. | 2017-09-09 12:09:53 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a22f2e683b | Add type restriction to activitypub fetcher Mainly because Mastodon only returns notes, not the other activities. | 2017-09-09 12:05:17 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 95cedd6000 | Make auth tokens usable once and expire them. | 2017-09-09 12:02:59 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 95aa6a3c65 | Try to fetch from html again if fetching from atom gives no results. | 2017-09-08 09:08:31 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2652d9e4ed | Slight cleanup. | 2017-09-07 08:58:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2a298d70f9 | Add very basic oauth and mastodon api support. | 2017-09-06 19:06:25 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a441ee7d21 | Workaround for masto reply breakage. | 2017-09-05 14:01:37 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e9ebfdb83b | Fix remote profile update code. | 2017-09-05 11:40:34 +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 | 3438a120cc | Don't delete new delete activity... | 2017-09-04 20:47:43 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fcf3128a56 | Add TwAPI representer for deletes. | 2017-09-04 20:03:28 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2348b272e0 | Create deletes activities for incoming deletes. | 2017-09-04 18:47:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5db535c0b1 | Add delete to ActivityPub. | 2017-09-04 18:47:33 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 540dfb4617 | Add delete activity representer. | 2017-09-04 17:56:09 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 10e40206c6 | Output mastodon-style conversation ids. | 2017-09-04 11:04:04 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1b1f861bad | Handle mastodon conversation ids. | 2017-09-04 11:03:51 +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 | fecbd099cd | Ignore padding for salmon public keys. | 2017-08-25 15:09:05 +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 | 08bd59e446 | Extend webfinger capabilities. | 2017-08-24 12:54:53 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1a001588e8 | Don't break on empty mentions. | 2017-08-24 12:54:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e477608b7e | add correct content type for catch-all | 2017-08-22 14:22:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 552cfdbe11 | Fix deletion not deleting relevant actions. | 2017-08-16 16:29:25 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7d34cec58d | escape attachment urls on creation. | 2017-08-09 16:55:18 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9fd8640202 | Order by id instead of inserted_at to better use indexes. | 2017-08-08 12:24:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 763756f879 | Also fetch atom links. | 2017-08-04 16:57:38 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 27b8e3affb | Revert "Better error handling for user feeds." This reverts commit 11714fbaa2. | 2017-08-03 17:49:18 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 11714fbaa2 | Better error handling for user feeds. | 2017-08-03 17:46:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7b0dd964be | Slightly nicer webfinger error handling. | 2017-08-03 14:14:48 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 571f07abe3 | Try refresh all invalid subscriptions. This is a temporary fix to prevent intermittent problems from cutting
off subscriptions. | 2017-08-02 12:42:12 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e4a4135c1d | Handle subscriptions in queue. | 2017-08-02 12:34:48 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 54af9e145a | Add some debug info to websub. | 2017-08-02 12:03:45 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 25c733f402 | Add href to in-reply-to. THis should enable fetching from pleroma posts. | 2017-08-01 17:35:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | f226f46a09 | Add basic incoming deletions. | 2017-08-01 17:05:07 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 558ab6e74e | Display html links correctly for remote activies. | 2017-08-01 14:05:18 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c3dfa1970f | Don't crash on activity handling problems. | 2017-08-01 12:41:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 368fa25f1f | Strip all newlines in atom html content to work around mastodon bug. | 2017-07-31 13:31:21 +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 | fc269fd319 | Add html alternate link to atom. | 2017-07-29 22:07:02 +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 | 5e17e04144 | Make user timelines faster for users with few statuses. | 2017-07-01 16:43:10 +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 | 201804b836 | Only return posts in TwAPI conversations. | 2017-06-30 16:41:09 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d4de38e8ff | Order conversation fetches like GS does. | 2017-06-30 16:30:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fc7016a88c | Don't add public recipient to notes that don't contain it. | 2017-06-30 15:54:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d8bbbeb03a | Bio can actually be nil. | 2017-06-26 17:00:58 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1c074efeaf | Add external links to twapi. | 2017-06-25 12:07:08 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 429992fcc9 | Save external link for notes. | 2017-06-25 11:57:34 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 39bacba280 | More resilient xml parsing. | 2017-06-24 14:35:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6935fc3e01 | Update user data on fetch if it changed. | 2017-06-24 13:09:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ffc9d7708b | Handle webpubs in queue. | 2017-06-23 16:37:34 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6ee0ca21e2 | Some salmon debug fixes. Plus httpoison update. | 2017-06-23 16:22:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 4ba6746820 | use correct arity .post. | 2017-06-23 12:27:40 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6a184115a2 | Longer timeouts for outgoing federation. | 2017-06-23 12:25:53 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 42633406b3 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop | 2017-06-20 17:49:15 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 14d9de39e8 | Better debugging. | 2017-06-20 17:28:36 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | b76001ded3 | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop | 2017-06-20 17:57:04 +03:00 |  | 
				
					
						| 
								
								
									 dtluna | 08e53df91e | Move util functions to UtilController | 2017-06-20 17:55:57 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fe27b61a72 | Add some debugging to federations. | 2017-06-20 14:10:44 +02: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 | 5ff4a5eee3 | Save incoming tags as lowercase. | 2017-06-18 19:01:54 +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 | a1cabeea4a | Redirect html user profile request. | 2017-06-12 12:52:40 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6342fcd5dc | Save correct date for incoming notes. | 2017-06-08 16:44:12 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 00c032783d | Fix NaN statuses per day. | 2017-06-05 15:47:37 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | cdcb201bf5 | Represent object publishing date in notes. | 2017-06-02 22:47:49 +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 | 4cfe1e0c9b | Make timeouts longer, some servers are very slow. | 2017-05-31 18:24:50 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 80705c7a20 | Redirect to frontend on html notice path. | 2017-05-31 17:48:22 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | c6aa60c829 | Shorten names in links. | 2017-05-30 14:26:31 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | bdcf42180f | Save remote user bio and update if we see new data. | 2017-05-24 17:34:38 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 94e980d6b4 | Output proper published data in ostatus. | 2017-05-24 13:54:25 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 4854a604ef | Extract note handler. | 2017-05-20 13:41:33 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1085675ec4 | Output ref instead of href for conversation. | 2017-05-20 10:44:57 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9d97be4413 | Try fetching shares. | 2017-05-19 16:08:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 03b7b2fa24 | Also show activities in OStatus. | 2017-05-19 15:53:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 8e02fa100f | Add categories to ostatus output. | 2017-05-18 18:18:27 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b74125900c | save correct inReplyToStatusId. | 2017-05-18 17:03:21 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 042cdf09ca | Wire up inReplyToStatusIds for ostatus. | 2017-05-18 16:58:30 +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 | beb7b0ef07 | Handle incoming tags. | 2017-05-18 15:58:18 +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 | d95ac274d6 | On user making, check if we have a user with that uri. | 2017-05-12 18:58:25 +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 | dd12cf7296 | Fix cws. | 2017-05-11 17:59:11 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 932e0e87db | More debugging code. | 2017-05-11 09:34:11 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2154f729b0 | Don't fetch if we don't even have a inReplyTo. | 2017-05-11 09:32:03 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 312772df7c | Add debugging help. | 2017-05-11 09:13:14 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1b67a59795 | Repair retweets. | 2017-05-10 19:29:25 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9f15937fe6 | Actually guess 3 days... | 2017-05-10 19:12:40 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d2c4a427f1 | Only try refreshing every 6 hours. | 2017-05-10 19:08:42 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ae0e6d8003 | Handle cases where we don't get lease_seconds returned. | 2017-05-10 19:04:27 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 153995f832 | Correct active state websub name. | 2017-05-10 18:54:43 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 05f2cd0d93 | Handle incoming follows. Also Mastodon CWs. | 2017-05-10 18:46:23 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 34a1ce00ec | Set valid_until date. | 2017-05-10 18:45:55 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a2ca3b8605 | Add option to keep id for follows. | 2017-05-10 18:45:38 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 36448d6483 | Add externalprofile to TwAPI. | 2017-05-10 18:44:57 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2e753e8cd7 | Refresh subscriptions. | 2017-05-10 18:44:06 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 118c572006 | Use changeset for remote user creation. | 2017-05-10 10:16:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e12a6d5666 | Get fresh objects on changes. This will count retweets / favs correctly again. | 2017-05-09 18:11:11 +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 | 8f9c43343e | Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop | 2017-05-08 19:35:16 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 3320c9b176 | Fix remote users retweeting local stuff. | 2017-05-08 18:19:45 +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 | e49770ee88 | Add some debugging info. | 2017-05-07 20:16:07 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | db08498a9f | Prevent double insertions. | 2017-05-07 20:13:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 4f9328c622 | Preserve ids on favorites / retweets. | 2017-05-07 20:05:03 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b403ea4d2b | Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity | 2017-05-07 19:28:23 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 60b4b0d725 | Safety measures. | 2017-05-07 14:52:19 +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 | c51e15975a | Fix user fetching error. | 2017-05-07 12:45:37 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fcd34096db | Add one more alias for twapi twkn. | 2017-05-06 22:26:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7db76a0f0e | Address incoming messages to followers. | 2017-05-06 14:23:39 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | bda389d7d9 | Subscribe to remote users on following. | 2017-05-06 14:09:39 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9cafb67fc1 | Follow redirects when fetching activities. This can happen for site that started as http and now switched to https. | 2017-05-06 13:18:08 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 22ddddce76 | Handle incoming items through the queue. | 2017-05-06 12:34:40 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7e65cad9fe | Do recursive fetching in-band for now. This is to prevent conversation id problems. | 2017-05-06 12:15:48 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 04f6ece99e | Send salmons and websub in background tasks. | 2017-05-05 20:38:10 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7752f103f6 | Add basic thread fetching. | 2017-05-05 20:15:26 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 00a7183118 | Basic queue. | 2017-05-05 18:58:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 2d9fdbcc0d | Don't call out if we have the favorited notice locally. | 2017-05-05 16:27:03 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | fa2610c795 | Handle incoming favorites, fetch potentially missing messages. | 2017-05-05 16:07:44 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d982f04a65 | Mock HTTPoison in testing. | 2017-05-05 14:16:54 +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 | c85998ab8a | Parse incoming retweets. | 2017-05-04 18:42:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5d9f3df714 | Just sign with an empty string if needed. | 2017-05-04 09:57:11 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 151da344be | Add debugging logs. | 2017-05-04 09:54:22 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 97257c692c | Fix specs. | 2017-05-03 20:06:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1077c5c58d | Remove reply-to for shares, mastodon gets confused. | 2017-05-03 20:06:00 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 53d05af5b6 | Fix Mastodon signature bug. | 2017-05-03 19:23:12 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 5d7831ee3e | Add self links to federated statuses. | 2017-05-03 18:10:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b34b046f16 | Add user to announced status. | 2017-05-03 17:51:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 861a294cda | Add announce federation. | 2017-05-03 17:41:55 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 138641589d | OStatus announce representer. | 2017-05-03 17:39:12 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | df71c142cf | Remove doubled 'to' recipients. | 2017-05-03 16:08:24 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 8141024259 | Attachment parsing, better magic key fetching. | 2017-05-03 14:26:49 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 16afea399d | Just give out the entry, not the whole feed. | 2017-05-03 10:02:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9c42453e06 | Return note objects as ostatus post activities. | 2017-05-03 09:54:17 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 018a1a390f | Use inReplyTo to find context. | 2017-05-02 21:31:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 33c803d6da | Add attachment link to posts. | 2017-05-02 18:25:39 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | b104348fa5 | Follow webfinger redirects. | 2017-05-02 17:44:55 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 96014f8e0b | Update incoming new avatars. | 2017-05-02 17:16:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 102455bf29 | Add avatar updating from incoming messages. | 2017-05-02 17:13:41 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 945b4b55e6 | Federate likes. | 2017-05-02 16:45:54 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 93de603966 | Add an ostatus representer for like activities. | 2017-05-02 16:35:53 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a3e82c5c24 | Save context in likes / announces. | 2017-05-02 15:54:14 +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 | 6dd8335477 | Mark incoming activties as non-local. | 2017-05-02 10:47:04 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 89c1e90eb2 | Don't crypt raw iolists. | 2017-05-01 22:02:07 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 8ae13d94dc | Use empty context id if we get none Thanks mastodon. | 2017-05-01 20:38:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | aa20941416 | Some servers send empty lease_seconds requests... | 2017-05-01 20:09:00 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 703d9f3628 | Not enough h. | 2017-05-01 20:04:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 76e653b0d8 | Add user profile page link. | 2017-05-01 20:02:32 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ceb2f68432 | Add type to rel=self link in feed. | 2017-05-01 18:40:36 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e88062494e | Revert "Also accept user id as feed topic." This reverts commit 97d11dec0e. | 2017-05-01 18:34:15 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 97d11dec0e | Also accept user id as feed topic. | 2017-05-01 18:07:50 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 92a8944dfe | Redirect to user feed instead of directly serving it. | 2017-05-01 18:05:02 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1854842b09 | Log subscription error. | 2017-05-01 17:28:49 +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 | d187a4965f | Return feed for xml requests of the user. | 2017-05-01 14:07:41 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 35938656ab | Make user keys on usage. | 2017-05-01 14:07:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e54e592d6c | Return webfinger for ap_ids. | 2017-05-01 13:51:17 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 6843755834 | Make outgoing salmons work. | 2017-05-01 13:14:58 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a173fb9e41 | Get users fresh, might so we don't make new keys all the time. | 2017-04-30 15:05:16 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | bb1d08a47c | Return keys in webfinger. | 2017-04-30 15:00:04 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 09f7ed4214 | Don't set statusnetConversationIds on replies anymore. | 2017-04-30 14:26:29 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 009fcd2acf | Stop adding statusnetConversationIds. | 2017-04-30 14:02:04 +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 | f9912599c4 | Pull in remote avatar on federation. | 2017-04-30 12:53:49 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 18edc299b2 | Handle duplicates. | 2017-04-30 12:36:47 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 62607f37dc | Federate object id for posts in ostatus. This is because ostatus doens't have an id for the activities. | 2017-04-30 11:55:19 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 84027ff00b | Handle comments. | 2017-04-30 11:39:27 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d937a8e695 | Add thr:in-reply-to to ostatus representer. | 2017-04-30 11:17:34 +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 |  | 
				
					
						| 
								
								
									 Roger Braun | 8a0d2b33d8 | Keep ostatus id as activity id. | 2017-04-30 09:25:46 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | a16da387d2 | Handle full incoming feeds. | 2017-04-29 21:13:21 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 20015b4b67 | Save remote users with fqn as nickname. | 2017-04-29 20:08:45 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ba1ea77001 | Make key fetching use ostatus fetching. | 2017-04-29 19:47:56 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 427bac0966 | Rework remote user subscription. | 2017-04-29 19:06:01 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 69922bc724 | Add user info gathering. | 2017-04-29 17:51:59 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | ca40dda04c | Add some basic webfingering. | 2017-04-28 17:41:12 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 59d4cc6036 | normalize hex number. | 2017-04-28 15:53:45 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 1422e7aa84 | Handle incoming websub subscriptions. | 2017-04-28 15:45:10 +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 |  | 
				
					
						| 
								
								
									 Roger Braun | 451d18af63 | Add proper callback route for websub confirmation. | 2017-04-28 09:51:47 +02:00 |  | 
				
					
						| 
								
								
									 dtluna | 6cf7c13228 | Refactor code to comply with credo suggestions | 2017-04-27 16:18:50 +03:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 90da25505f | Add discovery and subscription requests to websub. | 2017-04-27 09:46:45 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | e8a311ecff | Add user and hub to websub client subscriptions. | 2017-04-27 09:44:20 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | d1dce56a85 | Refactor XML parsing. | 2017-04-27 09:43:58 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 9e9d95ec99 | Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus | 2017-04-26 19:17:51 +02:00 |  | 
				
					
						| 
								
								
									 Roger Braun | 7561158ab1 | Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus | 2017-04-26 18:34:14 +02:00 |  |