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

Move PROTOCOL_* constants to Model\Conversation

This commit is contained in:
Hypolite Petovan 2018-02-05 14:09:03 -05:00
parent a0cdd9c674
commit a62b46375d
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
boot.php
View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* @file boot.php * @file_tag_unsave_file boot.php
* This file defines some global constants and includes the central App class. * This file defines some global constants and includes the central App class.
*/ */
@ -23,13 +23,14 @@ use Friendica\App;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/text.php'; require_once 'include/text.php';
@ -233,17 +234,19 @@ define('CP_USERS_AND_GLOBAL', 2);
/** /**
* @name Protocols * @name Protocols
* @deprecated since version 3.6
* @see Conversation
* *
* Different protocols that we are storing * Different protocols that we are storing
* @{ * @{
*/ */
define('PROTOCOL_UNKNOWN', 0); define('PROTOCOL_UNKNOWN' , Conversation::PROTOCOL_UNKNOWN);
define('PROTOCOL_DFRN', 1); define('PROTOCOL_DFRN' , Conversation::PROTOCOL_DFRN);
define('PROTOCOL_DIASPORA', 2); define('PROTOCOL_DIASPORA' , Conversation::PROTOCOL_DIASPORA);
define('PROTOCOL_OSTATUS_SALMON', 3); define('PROTOCOL_OSTATUS_SALMON' , Conversation::PROTOCOL_OSTATUS_SALMON);
define('PROTOCOL_OSTATUS_FEED', 4); // Deprecated define('PROTOCOL_OSTATUS_FEED' , Conversation::PROTOCOL_OSTATUS_FEED); // Deprecated
define('PROTOCOL_GS_CONVERSATION', 5); // Deprecated define('PROTOCOL_GS_CONVERSATION', Conversation::PROTOCOL_GS_CONVERSATION); // Deprecated
define('PROTOCOL_SPLITTED_CONV', 6); define('PROTOCOL_SPLITTED_CONV' , Conversation::PROTOCOL_SPLITTED_CONV);
/** /**
* @} * @}
*/ */
@ -251,7 +254,7 @@ define('PROTOCOL_SPLITTED_CONV', 6);
/** /**
* @name Network constants * @name Network constants
* @deprecated since version 3.6 * @deprecated since version 3.6
* @see Friendica\Core\Protocol * @see Protocol
* *
* Network and protocol family types * Network and protocol family types
* @{ * @{

8
src/Model/Conversation.php
View File

@ -11,6 +11,14 @@ require_once "include/dba.php";
class Conversation class Conversation
{ {
const PROTOCOL_UNKNOWN = 0;
const PROTOCOL_DFRN = 1;
const PROTOCOL_DIASPORA = 2;
const PROTOCOL_OSTATUS_SALMON = 3;
const PROTOCOL_OSTATUS_FEED = 4; // Deprecated
const PROTOCOL_GS_CONVERSATION = 5; // Deprecated
const PROTOCOL_SPLITTED_CONV = 6;
/** /**
* @brief Store the conversation data * @brief Store the conversation data
* *