fix channelId relation

This commit is contained in:
yggverse 2024-05-05 03:05:50 +03:00
parent 3000f643f8
commit 21028c2416
2 changed files with 30 additions and 28 deletions

View file

@ -167,36 +167,36 @@ class Nex implements MessageComponentInterface
{
$lines[] = $channel->description . PHP_EOL;
}
}
// Get channel items
foreach ((array) $this->_database->getChannelItems(0, 20) as $channelItem)
{
$lines[] = sprintf(
'=> /%d.gmi %s %s',
$channelItem->id,
$channelItem->pubTime ?
date(
'Y-m-d',
$channelItem->pubTime
) : '',
\Yggverse\Pulsar\Model\Filter::string(
$channelItem->title
)
);
if ($channelItem->description)
// Get channel items
foreach ((array) $this->_database->getChannelItems($channel->id, 0, 20) as $channelItem)
{
$lines[] = \Yggverse\Pulsar\Model\Filter::text(
$channelItem->description
) . PHP_EOL;
}
$lines[] = sprintf(
'=> /%d.gmi %s %s',
$channelItem->id,
$channelItem->pubTime ?
date(
'Y-m-d',
$channelItem->pubTime
) : '',
\Yggverse\Pulsar\Model\Filter::string(
$channelItem->title
)
);
if ($channelItem->content)
{
$lines[] = \Yggverse\Pulsar\Model\Filter::text(
$channelItem->content
) . PHP_EOL;
if ($channelItem->description)
{
$lines[] = \Yggverse\Pulsar\Model\Filter::text(
$channelItem->description
) . PHP_EOL;
}
if ($channelItem->content)
{
$lines[] = \Yggverse\Pulsar\Model\Filter::text(
$channelItem->content
) . PHP_EOL;
}
}
}

View file

@ -198,13 +198,15 @@ class Database
}
public function getChannelItems(
int $channelId,
int $start = 0,
int $limit = 20
): ?array
{
$query = $this->_database->query(
sprintf(
'SELECT * FROM `channelItem` ORDER BY `pubTime` DESC, `time` DESC, `id` DESC LIMIT %d,%d',
'SELECT * FROM `channelItem` WHERE `channelId` = %d ORDER BY `pubTime` DESC, `time` DESC, `id` DESC LIMIT %d,%d',
$channelId,
$start,
$limit
)