mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:35:12 +00:00
sql error
This commit is contained in:
parent
0460814158
commit
cdee25ea1b
3 changed files with 98 additions and 29 deletions
|
@ -1590,9 +1590,18 @@ class Activity {
|
||||||
];
|
];
|
||||||
|
|
||||||
$mps = [];
|
$mps = [];
|
||||||
if(array_key_exists('url',$act->obj) && is_array($act->obj['url'])) {
|
$ptr = null;
|
||||||
foreach($act->obj['url'] as $vurl) {
|
|
||||||
if(in_array($vurl['mimeType'], $vtypes)) {
|
if(array_key_exists('url',$act->obj)) {
|
||||||
|
if(is_array($act->obj['url'])) {
|
||||||
|
if(array_key_exists(0,$act->obj['url'])) {
|
||||||
|
$ptr = $act->obj['url'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$ptr = [ $act->obj['url'] ];
|
||||||
|
}
|
||||||
|
foreach($ptr as $vurl) {
|
||||||
|
if(in_array($vurl['mediaType'], $vtypes)) {
|
||||||
if(! array_key_exists('width',$vurl)) {
|
if(! array_key_exists('width',$vurl)) {
|
||||||
$vurl['width'] = 0;
|
$vurl['width'] = 0;
|
||||||
}
|
}
|
||||||
|
@ -1609,6 +1618,10 @@ class Activity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elseif(is_string($act->obj['url'])) {
|
||||||
|
$s['body'] .= "\n\n" . '[video]' . $act->obj['url'] . '[/video]';
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($act->obj['type'] === 'Audio') {
|
if($act->obj['type'] === 'Audio') {
|
||||||
|
@ -1619,28 +1632,84 @@ class Activity {
|
||||||
'audio/wav'
|
'audio/wav'
|
||||||
];
|
];
|
||||||
|
|
||||||
if(array_key_exists('url',$act->obj) && is_array($act->obj['url'])) {
|
$ptr = null;
|
||||||
foreach($act->obj['url'] as $vurl) {
|
|
||||||
if(in_array($vurl['mimeType'], $atypes)) {
|
if(array_key_exists('url',$act->obj)) {
|
||||||
|
if(is_array($act->obj['url'])) {
|
||||||
|
if(array_key_exists(0,$act->obj['url'])) {
|
||||||
|
$ptr = $act->obj['url'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$ptr = [ $act->obj['url'] ];
|
||||||
|
}
|
||||||
|
foreach($ptr as $vurl) {
|
||||||
|
if(in_array($vurl['mediaType'], $atypes)) {
|
||||||
$s['body'] .= "\n\n" . '[audio]' . $vurl['href'] . '[/audio]';
|
$s['body'] .= "\n\n" . '[audio]' . $vurl['href'] . '[/audio]';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elseif(is_string($act->obj['url'])) {
|
||||||
|
$s['body'] .= "\n\n" . '[audio]' . $act->obj['url'] . '[/audio]';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($act->obj['type'] === 'Image') {
|
if($act->obj['type'] === 'Image') {
|
||||||
if(array_key_exists('url',$act->obj) && is_array($act->obj['url'])) {
|
|
||||||
foreach($act->obj['url'] as $vurl) {
|
$ptr = null;
|
||||||
|
|
||||||
|
if(array_key_exists('url',$act->obj)) {
|
||||||
|
if(is_array($act->obj['url'])) {
|
||||||
|
if(array_key_exists(0,$act->obj['url'])) {
|
||||||
|
$ptr = $act->obj['url'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$ptr = [ $act->obj['url'] ];
|
||||||
|
}
|
||||||
|
foreach($ptr as $vurl) {
|
||||||
if(strpos($s['body'],$vurl['href']) === false) {
|
if(strpos($s['body'],$vurl['href']) === false) {
|
||||||
$s['body'] .= "\n\n" . '[zmg]' . $vurl['href'] . '[/zmg]';
|
$s['body'] .= "\n\n" . '[zmg]' . $vurl['href'] . '[/zmg]';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
elseif(is_string($act->obj['url'])) {
|
||||||
|
if(strpos($s['body'],$act->obj['url']) === false) {
|
||||||
|
$s['body'] .= "\n\n" . '[zmg]' . $act->obj['url'] . '[/zmg]';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(in_array($act->obj['type'],[ 'Note','Article' ])) {
|
||||||
|
$ptr = null;
|
||||||
|
|
||||||
|
if(array_key_exists('url',$act->obj)) {
|
||||||
|
if(is_array($act->obj['url'])) {
|
||||||
|
if(array_key_exists(0,$act->obj['url'])) {
|
||||||
|
$ptr = $act->obj['url'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$ptr = [ $act->obj['url'] ];
|
||||||
|
}
|
||||||
|
foreach($ptr as $vurl) {
|
||||||
|
if(array_key_exists('mediaType',$vurl) && $vurl['mediaType'] === 'text/plain') {
|
||||||
|
$s['plink'] = $vurl['href'];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
elseif(is_string($act->obj['url'])) {
|
||||||
|
$s['plink'] = $act->obj['url'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! $s['plink']) {
|
||||||
|
$s['plink'] = $s['mid'];
|
||||||
|
}
|
||||||
|
|
||||||
if($act->recips && (! in_array(ACTIVITY_PUBLIC_INBOX,$act->recips)))
|
if($act->recips && (! in_array(ACTIVITY_PUBLIC_INBOX,$act->recips)))
|
||||||
$s['item_private'] = 1;
|
$s['item_private'] = 1;
|
||||||
|
|
|
@ -49,7 +49,7 @@ class Libsync {
|
||||||
if(intval($channel['channel_removed']))
|
if(intval($channel['channel_removed']))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$h = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash = '%s' and hubloc_netwoor = 'zot6' and hubloc_deleted = 0",
|
$h = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash = '%s' and hubloc_network = 'zot6' and hubloc_deleted = 0",
|
||||||
dbesc(($keychange) ? $packet['keychange']['old_hash'] : $channel['channel_hash'])
|
dbesc(($keychange) ? $packet['keychange']['old_hash'] : $channel['channel_hash'])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -4301,7 +4301,7 @@ class JsonLdProcessor {
|
||||||
sort($nquads);
|
sort($nquads);
|
||||||
|
|
||||||
// cache and return hashed quads
|
// cache and return hashed quads
|
||||||
$hash = $bnodes->{$id}->hash = sha1(implode($nquads));
|
$hash = $bnodes->{$id}->hash = hash('sha256',implode($nquads));
|
||||||
return $hash;
|
return $hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4320,8 +4320,8 @@ class JsonLdProcessor {
|
||||||
* @return stdClass the hash and path namer used.
|
* @return stdClass the hash and path namer used.
|
||||||
*/
|
*/
|
||||||
protected function _hashPaths($id, $bnodes, $namer, $path_namer) {
|
protected function _hashPaths($id, $bnodes, $namer, $path_namer) {
|
||||||
// create SHA-1 digest
|
// create digest
|
||||||
$md = hash_init('sha1');
|
$md = hash_init('sha256');
|
||||||
|
|
||||||
// group adjacent bnodes by hash, keep properties and references separate
|
// group adjacent bnodes by hash, keep properties and references separate
|
||||||
$groups = new stdClass();
|
$groups = new stdClass();
|
||||||
|
@ -4350,7 +4350,7 @@ class JsonLdProcessor {
|
||||||
}
|
}
|
||||||
|
|
||||||
// hash direction, property, and bnode name/hash
|
// hash direction, property, and bnode name/hash
|
||||||
$group_md = hash_init('sha1');
|
$group_md = hash_init('sha256');
|
||||||
hash_update($group_md, $direction);
|
hash_update($group_md, $direction);
|
||||||
hash_update($group_md, $quad->predicate->value);
|
hash_update($group_md, $quad->predicate->value);
|
||||||
hash_update($group_md, $name);
|
hash_update($group_md, $name);
|
||||||
|
@ -4433,7 +4433,7 @@ class JsonLdProcessor {
|
||||||
$path_namer = $chosen_namer;
|
$path_namer = $chosen_namer;
|
||||||
}
|
}
|
||||||
|
|
||||||
// return SHA-1 hash and path namer
|
// return hash and path namer
|
||||||
return (object)array(
|
return (object)array(
|
||||||
'hash' => hash_final($md), 'pathNamer' => $path_namer);
|
'hash' => hash_final($md), 'pathNamer' => $path_namer);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue