harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
begin directory migration to zot6, see the code comments

See merge request hubzilla/core!1687
This commit is contained in:
Mario 2019-07-02 22:02:15 +02:00
commit 001734a725
4 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Module/Apschema.php
View File

@ -41,7 +41,10 @@ class Apschema extends \Zotlabs\Web\Controller {
], ],
'ostatus' => 'http://ostatus.org#', 'ostatus' => 'http://ostatus.org#',
'conversation' => 'ostatus:conversation' 'conversation' => 'ostatus:conversation',
'diaspora' => 'https://diasporafoundation.org/ns/',
'guid' => 'diaspora:guid'
] ]
]; ];

11
Zotlabs/Module/Channel.php
View File

@ -111,6 +111,17 @@ class Channel extends Controller {
// we start loading content // we start loading content
profile_load($which,$profile); profile_load($which,$profile);
App::$page['htmlhead'] .= '<meta property="og:title" content="' . htmlspecialchars($channel['channel_name']) . '">' . "\r\n";
App::$page['htmlhead'] .= '<meta property="og:image" content="' . $channel['xchan_photo_l'] . '">' . "\r\n";
if(App::$profile['about'] && perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_profile')) {
App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(App::$profile['about']) . '">' . "\r\n";
}
else {
App::$page['htmlhead'] .= '<meta property="og:description" content="' . htmlspecialchars(sprintf( t('This is the home page of %s.'), $channel['channel_name'])) . '">' . "\r\n";
}
} }
function get($update = 0, $load = false) { function get($update = 0, $load = false) {

2
boot.php
View File

@ -468,7 +468,7 @@ define ( 'NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/' );
define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' ); define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' );
define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.6' ); define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.7' );
/** /**
* activity stream defines * activity stream defines
*/ */

35
include/dir_fns.php
View File

@ -329,13 +329,36 @@ function update_directory_entry($ud) {
if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) { if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) {
$success = false; $success = false;
$x = zot_finger($ud['ud_addr'], '');
if ($x['success']) {
$j = json_decode($x['body'], true);
if ($j)
$success = true;
$y = import_xchan($j, 0, $ud); // directory migration phase 1 (Macgirvin - 29-JUNE-2019)
// fetch zot6 info (if available) as well as historical zot info (if available)
// Once this has been running for > 1 month on the primary directory we can deprecate the historical info and
// modify the directory search to only return zot6 entries, and also modify this function
// to *only* fetch the zot6 entries.
// Otherwise we'll be showing duplicates or have a mostly empty directory for a good chunk of
// the transition period. Directory server load will likely increase "moderately" during this transition.
// The one month counter begins when the primary directory has upgraded to a release which uses this code.
// Hubzilla channels running traditional zot which have not upgraded can or will be dropped from the directory or
// "not found" at the end of the transition period as the directory will only serve zot6 entries at that time.
$uri = \Zotlabs\Lib\Webfinger::zot_url($ud['ud_addr']);
if($uri) {
$record = \Zotlabs\Lib\Zotfinger::exec($uri);
// Check the HTTP signature
$hsig = $record['signature'];
if($hsig && $hsig['signer'] === $url && $hsig['header_valid'] === true && $hsig['content_valid'] === true) {
$x = \Zotlabs\Zot\Libzot::import_xchan($record['data'], 0, $ud);
if($x['success']) {
$success = true;
}
}
}
$x = \Zotlabs\Zot\Finger::run($ud['ud_addr'], '');
if ($x['success']) {
import_xchan($x, 0, $ud);
$success = true;
} }
if (! $success) { if (! $success) {
q("update updates set ud_last = '%s' where ud_addr = '%s'", q("update updates set ud_last = '%s' where ud_addr = '%s'",