Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-22 15:35:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of /home/macgirvin/z into dev

Browse source
This commit is contained in:
nobody 2020-09-01 19:54:01 -07:00
commit ea6a39344b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Zotlabs/Module/Dirsearch.php
View file

@ -248,6 +248,12 @@ class Dirsearch extends Controller {
foreach ($r as $rr) { foreach ($r as $rr) {
// We need a better way to do this than one query for every
// AP record. Leaving this for the moment because it produces
// the desired results of not having duplicate entries for
// a channel that has multiple identities across multiple
// networks.
if ($rr['xchan_network'] === 'activitypub') { if ($rr['xchan_network'] === 'activitypub') {
$z = q("select xchan_hash from xchan where xchan_url = '%s' and xchan_network = 'zot6' limit 1", $z = q("select xchan_hash from xchan where xchan_url = '%s' and xchan_network = 'zot6' limit 1",
dbesc($rr['xchan_url']) dbesc($rr['xchan_url'])

2
include/socgraph.php
View file

@ -216,7 +216,7 @@ function poco_load($xchan = '', $url = null) {
function ap_poco_load($xchan) { function ap_poco_load($xchan) {
$max = get_config('system','max_imported_follow',1000); $max = get_config('system','max_imported_follow',200);
if($xchan) { if($xchan) {
$cl = get_xconfig($xchan,'activitypub','collections'); $cl = get_xconfig($xchan,'activitypub','collections');