GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ROUTES] Allow accept-header specification during router creation

Browse Source 
Router:
- Fix calls to connect, most of them were misusing the function's params

URLMapper:
- Minor fixes
- Documentation
- Add support for accept-header specification

Plugins/*:
- Fix calls to connect
This commit is contained in:
brunoccast
2019-07-11 19:14:03 +01:00
committed by Diogo Cordeiro
parent 2032c7c1f7
commit 5c0a3102ff
48 changed files with 1023 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/Bookmark/BookmarkPlugin.php
View File

@@ -114,43 +114,44 @@ class BookmarkPlugin extends MicroAppPlugin
if (common_config('singleuser', 'enabled')) {
$nickname = User::singleUserNickname();
$m->connect('bookmarks',
array('action' => 'bookmarks', 'nickname' => $nickname));
['action' => 'bookmarks',
'nickname' => $nickname]);
$m->connect('bookmarks/rss',
array('action' => 'bookmarksrss', 'nickname' => $nickname));
['action' => 'bookmarksrss',
'nickname' => $nickname]);
} else {
$m->connect(':nickname/bookmarks',
array('action' => 'bookmarks'),
array('nickname' => Nickname::DISPLAY_FMT));
['action' => 'bookmarks'],
['nickname' => Nickname::DISPLAY_FMT]);
$m->connect(':nickname/bookmarks/rss',
array('action' => 'bookmarksrss'),
array('nickname' => Nickname::DISPLAY_FMT));
['action' => 'bookmarksrss'],
['nickname' => Nickname::DISPLAY_FMT]);
}
$m->connect('api/bookmarks/:id.:format',
array('action' => 'ApiTimelineBookmarks',
'id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)'));
['action' => 'ApiTimelineBookmarks'],
['id' => Nickname::INPUT_FMT,
'format' => '(xml|json|rss|atom|as)']);
$m->connect('main/bookmark/new',
array('action' => 'newbookmark'),
array('id' => '[0-9]+'));
['action' => 'newbookmark']);
$m->connect('main/bookmark/popup',
array('action' => 'bookmarkpopup'));
['action' => 'bookmarkpopup']);
$m->connect('main/bookmark/import',
array('action' => 'importdelicious'));
['action' => 'importdelicious']);
$m->connect('main/bookmark/forurl',
array('action' => 'bookmarkforurl'));
['action' => 'bookmarkforurl']);
$m->connect('bookmark/:id',
array('action' => 'showbookmark'),
array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
['action' => 'showbookmark'],
['id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}']);
$m->connect('notice/by-url/:id',
array('action' => 'noticebyurl'),
array('id' => '[0-9]+'));
['action' => 'noticebyurl'],
['id' => '[0-9]+']);
return true;
}