saulteafarmer/castopod
1
0
Fork 0
mirror of https://code.castopod.org/adaures/castopod synced 2025-06-06 18:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nodeinfo2): import database config + use dynamic table prefix for active local actors query

Browse Source
This commit is contained in:
Yassine Doghri 2023-11-06 10:47:10 +00:00
parent 2d52fa1046
commit 6a7ef0109a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/Fediverse/Models/ActorModel.php
View File

@ -12,6 +12,7 @@ namespace Modules\Fediverse\Models;
use CodeIgniter\Events\Events; use CodeIgniter\Events\Events;
use CodeIgniter\Model; use CodeIgniter\Model;
use Config\Database;
use Modules\Fediverse\Config\Fediverse; use Modules\Fediverse\Config\Fediverse;
use Modules\Fediverse\Entities\Actor; use Modules\Fediverse\Entities\Actor;
@ -226,7 +227,10 @@ class ActorModel extends Model
if (! ($found = cache($cacheName))) { if (! ($found = cache($cacheName))) {
$tablePrefix = config(Database::class) $tablePrefix = config(Database::class)
->default['DBPrefix']; ->default['DBPrefix'];
$result = $this->select('COUNT(DISTINCT `cp_fediverse_actors`.`id`) as `total_active_actors`', false) $result = $this->select(
'COUNT(DISTINCT `' . $tablePrefix . 'fediverse_actors`.`id`) as `total_active_actors`',
false
)
->join( ->join(
$tablePrefix . 'fediverse_posts', $tablePrefix . 'fediverse_posts',
$tablePrefix . 'fediverse_actors.id = ' . $tablePrefix . 'fediverse_posts.actor_id', $tablePrefix . 'fediverse_actors.id = ' . $tablePrefix . 'fediverse_posts.actor_id',
@ -237,7 +241,7 @@ class ActorModel extends Model
$tablePrefix . 'fediverse_actors.id = ' . $tablePrefix . 'fediverse_favourites.actor_id', $tablePrefix . 'fediverse_actors.id = ' . $tablePrefix . 'fediverse_favourites.actor_id',
'left outer' 'left outer'
) )
->where($tablePrefix . 'actors.domain', get_current_domain()) ->where($tablePrefix . 'fediverse_actors.domain', get_current_domain())
->groupStart() ->groupStart()
->where( ->where(
"`{$tablePrefix}fediverse_posts`.`created_at` >= UTC_TIMESTAMP() - INTERVAL {$lastNumberOfMonths} month", "`{$tablePrefix}fediverse_posts`.`created_at` >= UTC_TIMESTAMP() - INTERVAL {$lastNumberOfMonths} month",