clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10820 from annando/more-q 

Some more "q" calls and deprecated logging replaced
This commit is contained in:
Hypolite Petovan 2021-10-03 15:57:05 -04:00 committed by GitHub
parent caa1a5aeac e1ac33576a
commit fe68df8e6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/api.php
View File

@ -1001,7 +1001,7 @@ function api_statuses_mediap($type)
$a = DI::app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::log('api_statuses_update: no user'); logger::notice('api_statuses_update: no user');
throw new ForbiddenException(); throw new ForbiddenException();
} }
$user_info = api_get_user($a); $user_info = api_get_user($a);
@ -1055,7 +1055,7 @@ function api_statuses_update($type)
$a = DI::app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::log('api_statuses_update: no user'); logger::notice('api_statuses_update: no user');
throw new ForbiddenException(); throw new ForbiddenException();
} }
@ -1109,7 +1109,7 @@ function api_statuses_update($type)
$posts_day = Post::count($condition); $posts_day = Post::count($condition);
if ($posts_day > $throttle_day) { if ($posts_day > $throttle_day) {
Logger::log('Daily posting limit reached for user '.api_user(), Logger::DEBUG); logger::info('Daily posting limit reached for user '.api_user());
// die(api_error($type, DI::l10n()->t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day)); // die(api_error($type, DI::l10n()->t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
throw new TooManyRequestsException(DI::l10n()->tt("Daily posting limit of %d post reached. The post was rejected.", "Daily posting limit of %d posts reached. The post was rejected.", $throttle_day)); throw new TooManyRequestsException(DI::l10n()->tt("Daily posting limit of %d post reached. The post was rejected.", "Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
} }
@ -1123,7 +1123,7 @@ function api_statuses_update($type)
$posts_week = Post::count($condition); $posts_week = Post::count($condition);
if ($posts_week > $throttle_week) { if ($posts_week > $throttle_week) {
Logger::log('Weekly posting limit reached for user '.api_user(), Logger::DEBUG); logger::info('Weekly posting limit reached for user '.api_user());
// die(api_error($type, DI::l10n()->t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week))); // die(api_error($type, DI::l10n()->t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)));
throw new TooManyRequestsException(DI::l10n()->tt("Weekly posting limit of %d post reached. The post was rejected.", "Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)); throw new TooManyRequestsException(DI::l10n()->tt("Weekly posting limit of %d post reached. The post was rejected.", "Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week));
} }
@ -1137,7 +1137,7 @@ function api_statuses_update($type)
$posts_month = Post::count($condition); $posts_month = Post::count($condition);
if ($posts_month > $throttle_month) { if ($posts_month > $throttle_month) {
Logger::log('Monthly posting limit reached for user '.api_user(), Logger::DEBUG); logger::info('Monthly posting limit reached for user '.api_user());
// die(api_error($type, DI::l10n()->t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month)); // die(api_error($type, DI::l10n()->t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
throw new TooManyRequestsException(DI::l10n()->t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month)); throw new TooManyRequestsException(DI::l10n()->t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
} }
@ -1238,7 +1238,7 @@ function api_media_upload()
$a = DI::app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::log('no user'); logger::notice('no user');
throw new ForbiddenException(); throw new ForbiddenException();
} }
@ -1894,7 +1894,7 @@ function api_statuses_show($type)
$id = intval(DI::args()->getArgv()[4] ?? 0); $id = intval(DI::args()->getArgv()[4] ?? 0);
} }
Logger::log('API: api_statuses_show: ' . $id); logger::notice('API: api_statuses_show: ' . $id);
$conversation = !empty($_REQUEST['conversation']); $conversation = !empty($_REQUEST['conversation']);
@ -2056,7 +2056,7 @@ function api_statuses_repeat($type)
$id = intval(DI::args()->getArgv()[4] ?? 0); $id = intval(DI::args()->getArgv()[4] ?? 0);
} }
Logger::log('API: api_statuses_repeat: '.$id); logger::notice('API: api_statuses_repeat: ' . $id);
$fields = ['uri-id', 'network', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink']; $fields = ['uri-id', 'network', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
$item = Post::selectFirst($fields, ['id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED]]); $item = Post::selectFirst($fields, ['id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
@ -2139,7 +2139,7 @@ function api_statuses_destroy($type)
$id = intval(DI::args()->getArgv()[4] ?? 0); $id = intval(DI::args()->getArgv()[4] ?? 0);
} }
Logger::log('API: api_statuses_destroy: '.$id); logger::notice('API: api_statuses_destroy: ' . $id);
$ret = api_statuses_show($type); $ret = api_statuses_show($type);
@ -4589,11 +4589,9 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype); $filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
Logger::log( logger::info(
"File upload src: " . $src . " - filename: " . $filename . "File upload src: " . $src . " - filename: " . $filename .
" - size: " . $filesize . " - type: " . $filetype, " - size: " . $filesize . " - type: " . $filetype);
Logger::DEBUG
);
// check if there was a php upload error // check if there was a php upload error
if ($filesize == 0 && $media['error'] == 1) { if ($filesize == 0 && $media['error'] == 1) {
@ -4624,7 +4622,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
} }
if ($max_length > 0) { if ($max_length > 0) {
$Image->scaleDown($max_length); $Image->scaleDown($max_length);
Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG); logger::info("File upload: Scaling picture to new size " . $max_length);
} }
$width = $Image->getWidth(); $width = $Image->getWidth();
$height = $Image->getHeight(); $height = $Image->getHeight();
@ -4634,17 +4632,17 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
if ($mediatype == "photo") { if ($mediatype == "photo") {
// upload normal image (scales 0, 1, 2) // upload normal image (scales 0, 1, 2)
Logger::log("photo upload: starting new photo upload", Logger::DEBUG); logger::info("photo upload: starting new photo upload");
$r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::log("photo upload: image upload with scale 0 (original size) failed"); logger::notice("photo upload: image upload with scale 0 (original size) failed");
} }
if ($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
$Image->scaleDown(640); $Image->scaleDown(640);
$r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::log("photo upload: image upload with scale 1 (640x640) failed"); logger::notice("photo upload: image upload with scale 1 (640x640) failed");
} }
} }
@ -4652,19 +4650,19 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$Image->scaleDown(320); $Image->scaleDown(320);
$r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::log("photo upload: image upload with scale 2 (320x320) failed"); logger::notice("photo upload: image upload with scale 2 (320x320) failed");
} }
} }
Logger::log("photo upload: new photo upload ended", Logger::DEBUG); logger::info("photo upload: new photo upload ended");
} elseif ($mediatype == "profileimage") { } elseif ($mediatype == "profileimage") {
// upload profile image (scales 4, 5, 6) // upload profile image (scales 4, 5, 6)
Logger::log("photo upload: starting new profile image upload", Logger::DEBUG); logger::info("photo upload: starting new profile image upload");
if ($width > 300 || $height > 300) { if ($width > 300 || $height > 300) {
$Image->scaleDown(300); $Image->scaleDown(300);
$r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::log("photo upload: profile image upload with scale 4 (300x300) failed"); logger::notice("photo upload: profile image upload with scale 4 (300x300) failed");
} }
} }
@ -4672,7 +4670,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$Image->scaleDown(80); $Image->scaleDown(80);
$r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::log("photo upload: profile image upload with scale 5 (80x80) failed"); logger::notice("photo upload: profile image upload with scale 5 (80x80) failed");
} }
} }
@ -4680,11 +4678,11 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$Image->scaleDown(48); $Image->scaleDown(48);
$r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
Logger::log("photo upload: profile image upload with scale 6 (48x48) failed"); logger::notice("photo upload: profile image upload with scale 6 (48x48) failed");
} }
} }
$Image->__destruct(); $Image->__destruct();
Logger::log("photo upload: new profile image upload ended", Logger::DEBUG); logger::info("photo upload: new profile image upload ended");
} }
if (!empty($r)) { if (!empty($r)) {

27
mod/ping.php
View File

@ -194,13 +194,7 @@ function ping_init(App $a)
$intros = $intros1 + $intros2; $intros = $intros1 + $intros2;
$myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname(); $myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
$mails = q( $mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", local_user(), $myurl]);
"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
intval(local_user()),
DBA::escape($myurl)
);
$mail_count = count($mails);
if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) { if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
$regs = Friendica\Model\Register::getPending(); $regs = Friendica\Model\Register::getPending();
@ -213,14 +207,9 @@ function ping_init(App $a)
$cachekey = "ping_init:".local_user(); $cachekey = "ping_init:".local_user();
$ev = DI::cache()->get($cachekey); $ev = DI::cache()->get($cachekey);
if (is_null($ev)) { if (is_null($ev)) {
$ev = q( $ev = DBA::selectToArray('event', ['type', 'start', 'adjust'],
"SELECT type, start FROM `event` ["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0 local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
ORDER BY `start` ASC ",
intval(local_user()),
DBA::escape(DateTimeFormat::utc('now + 7 days')),
DBA::escape(DateTimeFormat::utcNow())
);
if (DBA::isResult($ev)) { if (DBA::isResult($ev)) {
DI::cache()->set($cachekey, $ev, Duration::HOUR); DI::cache()->set($cachekey, $ev, Duration::HOUR);
} }
@ -447,12 +436,8 @@ function ping_get_notifications($uid)
$notification["name"] = strip_tags(BBCode::convert($notification["name"])); $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
$notification["message"] = \Friendica\Navigation\Notifications\Entity\Notify::formatMessage($notification["name"], BBCode::toPlaintext($notification["msg"])); $notification["message"] = \Friendica\Navigation\Notifications\Entity\Notify::formatMessage($notification["name"], BBCode::toPlaintext($notification["msg"]));
q( // @todo Replace this with a call of the Notify model class
"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d", DBA::update('notify', ['name_cache' => $notification["name"], 'msg_cache' => $notification["message"]], ['id' => $notification["id"]]);
DBA::escape($notification["name"]),
DBA::escape($notification["message"]),
intval($notification["id"])
);
} }
$notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"]; $notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];

18
src/Model/Contact/Group.php
View File

@ -22,6 +22,7 @@
namespace Friendica\Model\Contact; namespace Friendica\Model\Contact;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact;
/** /**
* This class provides information about contact groups based on the "group_member" table. * This class provides information about contact groups based on the "group_member" table.
@ -75,20 +76,9 @@ class Group
*/ */
public static function listUngrouped(int $uid) public static function listUngrouped(int $uid)
{ {
return q("SELECT * return Contact::selectToArray([], ["`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed`
FROM `contact` AND `id` NOT IN (SELECT DISTINCT(`contact-id`) FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
WHERE `uid` = %d WHERE `group`.`uid` = ?)", $uid, $uid]);
AND NOT `self`
AND NOT `deleted`
AND NOT `blocked`
AND NOT `pending`
AND NOT `failed`
AND `id` NOT IN (
SELECT DISTINCT(`contact-id`)
FROM `group_member`
INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
WHERE `group`.`uid` = %d
)", intval($uid), intval($uid));
} }
/** /**