Merge branch '2023.03-rc' into stable

[friendica.git] / src / Model / Conversation.php

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 4739b2f0a17bfac46adfe5527e1051cfa5f5daa2..3fa17228d6619ca1aac1c8a8958ef69bfe40d2cb 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -32,11 +32,15 @@ class Conversation
        const PARCEL_DIASPORA           = 2;
        const PARCEL_SALMON             = 3;
        const PARCEL_FEED               = 4; // Deprecated
-       const PARCEL_SPLIT_CONVERSATION = 6;
+       const PARCEL_SPLIT_CONVERSATION = 6; // @deprecated since version 2022.09
        const PARCEL_LEGACY_DFRN        = 7; // @deprecated since version 2021.09
        const PARCEL_DIASPORA_DFRN      = 8;
        const PARCEL_LOCAL_DFRN         = 9;
        const PARCEL_DIRECT             = 10;
+       const PARCEL_IMAP               = 11;
+       const PARCEL_RDF                = 12;
+       const PARCEL_RSS                = 13;
+       const PARCEL_ATOM               = 14;
        const PARCEL_TWITTER            = 67;
        const PARCEL_UNKNOWN            = 255;
 
@@ -45,7 +49,7 @@ class Conversation
         */
        const UNKNOWN = 0;
        /**
-        * The message had been pushed to this sytem
+        * The message had been pushed to this system
         */
        const PUSH    = 1;
        /**