kopia lustrzana https://github.com/friendica/friendica
Simplify constant names
https://github.com/friendica/friendica/pull/5036#discussion_r187792865pull/5036/head
rodzic
41a8c62bee
commit
736c76d068
|
@ -50,9 +50,9 @@ require_once "include/text.php";
|
|||
class DFRN
|
||||
{
|
||||
|
||||
const DFRN_TOP_LEVEL = 0; // Top level posting
|
||||
const DFRN_REPLY = 1; // Regular reply that is stored locally
|
||||
const DFRN_REPLY_RC = 2; // Reply that will be relayed
|
||||
const TOP_LEVEL = 0; // Top level posting
|
||||
const REPLY = 1; // Regular reply that is stored locally
|
||||
const REPLY_RC = 2; // Reply that will be relayed
|
||||
|
||||
/**
|
||||
* @brief Generates the atom entries for delivery.php
|
||||
|
@ -2141,7 +2141,7 @@ class DFRN
|
|||
|
||||
$changed = true;
|
||||
|
||||
if ($entrytype == DFRN::DFRN_REPLY_RC) {
|
||||
if ($entrytype == DFRN::REPLY_RC) {
|
||||
Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $current["id"]);
|
||||
}
|
||||
}
|
||||
|
@ -2211,12 +2211,12 @@ class DFRN
|
|||
}
|
||||
|
||||
if ($is_a_remote_action) {
|
||||
return DFRN::DFRN_REPLY_RC;
|
||||
return DFRN::REPLY_RC;
|
||||
} else {
|
||||
return DFRN::DFRN_REPLY;
|
||||
return DFRN::REPLY;
|
||||
}
|
||||
} else {
|
||||
return DFRN::DFRN_TOP_LEVEL;
|
||||
return DFRN::TOP_LEVEL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2290,7 +2290,7 @@ class DFRN
|
|||
{
|
||||
logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
|
||||
|
||||
if (($entrytype == DFRN::DFRN_TOP_LEVEL)) {
|
||||
if (($entrytype == DFRN::TOP_LEVEL)) {
|
||||
// The filling of the the "contact" variable is done for legcy reasons
|
||||
// The functions below are partly used by ostatus.php as well - where we have this variable
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($importer["id"]));
|
||||
|
@ -2634,7 +2634,7 @@ class DFRN
|
|||
$entrytype = self::getEntryType($importer, $item);
|
||||
|
||||
// Now assign the rest of the values that depend on the type of the message
|
||||
if (in_array($entrytype, [DFRN::DFRN_REPLY, DFRN::DFRN_REPLY_RC])) {
|
||||
if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
|
||||
if (!isset($item["object-type"])) {
|
||||
$item["object-type"] = ACTIVITY_OBJ_COMMENT;
|
||||
}
|
||||
|
@ -2656,10 +2656,10 @@ class DFRN
|
|||
}
|
||||
}
|
||||
|
||||
if ($entrytype == DFRN::DFRN_REPLY_RC) {
|
||||
if ($entrytype == DFRN::REPLY_RC) {
|
||||
$item["type"] = "remote-comment";
|
||||
$item["wall"] = 1;
|
||||
} elseif ($entrytype == DFRN::DFRN_TOP_LEVEL) {
|
||||
} elseif ($entrytype == DFRN::TOP_LEVEL) {
|
||||
if (!isset($item["object-type"])) {
|
||||
$item["object-type"] = ACTIVITY_OBJ_NOTE;
|
||||
}
|
||||
|
@ -2708,7 +2708,7 @@ class DFRN
|
|||
return;
|
||||
}
|
||||
|
||||
if (in_array($entrytype, [DFRN::DFRN_REPLY, DFRN::DFRN_REPLY_RC])) {
|
||||
if (in_array($entrytype, [DFRN::REPLY, DFRN::REPLY_RC])) {
|
||||
$posted_id = Item::insert($item);
|
||||
$parent = 0;
|
||||
|
||||
|
@ -2731,14 +2731,14 @@ class DFRN
|
|||
$parent_uri = $r[0]["parent-uri"];
|
||||
}
|
||||
|
||||
if ($posted_id && $parent && ($entrytype == DFRN::DFRN_REPLY_RC)) {
|
||||
if ($posted_id && $parent && ($entrytype == DFRN::REPLY_RC)) {
|
||||
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
|
||||
Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $posted_id);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
} else { // $entrytype == DFRN::DFRN_TOP_LEVEL
|
||||
} else { // $entrytype == DFRN::TOP_LEVEL
|
||||
if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) {
|
||||
logger("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", LOGGER_DEBUG);
|
||||
return;
|
||||
|
@ -2838,9 +2838,9 @@ class DFRN
|
|||
|
||||
Item::deleteById($item["id"]);
|
||||
|
||||
if ($entrytype != DFRN::DFRN_TOP_LEVEL) {
|
||||
if ($entrytype != DFRN::TOP_LEVEL) {
|
||||
// if this is a relayed delete, propagate it to other recipients
|
||||
if ($entrytype == DFRN::DFRN_REPLY_RC) {
|
||||
if ($entrytype == DFRN::REPLY_RC) {
|
||||
logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
|
||||
Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue