aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-23 18:19:25 +0000
committerMario <mario@mariovavti.com>2020-04-23 18:19:25 +0000
commitb7a655917ed1f7caa5b8b3d9b92fdd578c6252c4 (patch)
tree429a60947cdad2d19b05122f6f55ac8480ed6b7b /Zotlabs/Module
parentd8bfa5dd9614a3e7b8c167d2a76f86c30ad51f2d (diff)
downloadvolse-hubzilla-b7a655917ed1f7caa5b8b3d9b92fdd578c6252c4.tar.gz
volse-hubzilla-b7a655917ed1f7caa5b8b3d9b92fdd578c6252c4.tar.bz2
volse-hubzilla-b7a655917ed1f7caa5b8b3d9b92fdd578c6252c4.zip
some work on deprecating ACTIVITY_OBJ_FILE
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Sharedwithme.php5
-rw-r--r--Zotlabs/Module/Sse_bs.php8
2 files changed, 9 insertions, 4 deletions
diff --git a/Zotlabs/Module/Sharedwithme.php b/Zotlabs/Module/Sharedwithme.php
index c986f6695..f9d242dd3 100644
--- a/Zotlabs/Module/Sharedwithme.php
+++ b/Zotlabs/Module/Sharedwithme.php
@@ -1,5 +1,8 @@
<?php
namespace Zotlabs\Module;
+
+use Zotlabs\Web\Controller;
+
require_once('include/conversation.php');
require_once('include/text.php');
@@ -9,7 +12,7 @@ require_once('include/text.php');
*
*/
-class Sharedwithme extends \Zotlabs\Web\Controller {
+class Sharedwithme extends Controller {
function get() {
if(! local_channel()) {
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index c139fd19b..e4394fe33 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -128,6 +128,7 @@ class Sse_bs extends Controller {
WHERE uid = %d
AND created <= '%s'
AND item_unseen = 1 AND item_wall = 0
+ AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image')
AND author_xchan != '%s'
$item_normal
$sql_extra
@@ -193,6 +194,7 @@ class Sse_bs extends Controller {
WHERE uid = %d
AND created <= '%s'
AND item_unseen = 1 AND item_wall = 1
+ AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image')
AND author_xchan != '%s'
$item_normal
$sql_extra
@@ -268,6 +270,7 @@ class Sse_bs extends Controller {
WHERE uid = %d
AND created <= '%s'
AND item_unseen = 1
+ AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image')
AND author_xchan != '%s'
AND created > '%s'
$item_normal
@@ -448,19 +451,18 @@ class Sse_bs extends Controller {
$r = q("SELECT * FROM item
WHERE verb = '%s'
- AND obj_type = '%s'
+ AND obj_type in ('Document', 'Video', 'Audio', 'Image')
AND uid = %d
AND owner_xchan != '%s'
AND item_unseen = 1",
dbesc(ACTIVITY_POST),
- dbesc(ACTIVITY_OBJ_FILE),
intval(self::$uid),
dbesc(self::$ob_hash)
);
if($r) {
xchan_query($r);
foreach($r as $rr) {
- $result['files']['notifications'][] = Enotify::format_files($rr);
+ $result['files']['notifications'][] = Enotify::format($rr);
}
$result['files']['count'] = count($r);
}