Merge pull request #1095 from tobiasd/20210406-lng

[friendica-addons.git] / windowsphonepush / windowsphonepush.php

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index af687119573850ccfd08f67b6067b6ea536a9122..bf160f0a4b1fcb949e0641cc482b6222202faf59 100644 (file)
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -34,6 +34,7 @@ use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
 
 function windowsphonepush_install()
@@ -55,18 +56,6 @@ function windowsphonepush_install()
        Logger::log("installed windowsphonepush");
 }
 
-function windowsphonepush_uninstall()
-{
-       /* uninstall unregisters any hooks created with register_hook
-        * during install. Don't delete data in table `pconfig`.
-        */
-       Hook::unregister('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
-       Hook::unregister('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
-       Hook::unregister('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
-
-       Logger::log("removed windowsphonepush");
-}
-
 /* declare the windowsphonepush function so that /windowsphonepush url requests will land here */
 function windowsphonepush_module()
 {
@@ -91,8 +80,6 @@ function windowsphonepush_settings_post($a, $post)
        }
 
        DI::pConfig()->set(local_user(), 'windowsphonepush', 'senditemtext', intval($_POST['windowsphonepush-senditemtext']));
-
-       info(DI::l10n()->t('WindowsPhonePush settings updated.') . EOL);
 }
 
 /* Called from the Addon Setting form.
@@ -163,7 +150,7 @@ function windowsphonepush_cron()
                        } else {
                                // retrieve the number of unseen items and the id of the latest one (if there are more than
                                // one new entries since last poller run, only the latest one will be pushed)
-                               $count = q("SELECT count(`id`) as count, max(`id`) as max FROM `item` WHERE `unseen` = 1 AND `type` <> 'activity' AND `uid` = %d", intval($rr['uid']));
+                               $count = q("SELECT count(`id`) as count, max(`id`) as max FROM `post-view` WHERE `unseen` = 1 AND `type` <> 'activity' AND `uid` = %d", intval($rr['uid']));
 
                                // send number of unseen items to the device (the number will be displayed on Start screen until
                                // App will be started by user) - this update will be sent every 10 minutes to update the number to 0 if
@@ -198,7 +185,7 @@ function windowsphonepush_cron()
                                        $senditemtext = DI::pConfig()->get($rr['uid'], 'windowsphonepush', 'senditemtext');
                                        if ($senditemtext == 1) {
                                                // load item with the max id
-                                               $item = Item::selectFirst(['author-name', 'body'], ['id' => $count[0]['max']]);
+                                               $item = Post::selectFirst(['author-name', 'body'], ['id' => $count[0]['max']]);
 
                                                // as user allows to send the item, we want to show the sender of the item in the toast
                                                // toasts are limited to one line, therefore place is limited - author shall be in
@@ -214,7 +201,7 @@ function windowsphonepush_cron()
                                                if (substr($body, 0, 4) == "[url") {
                                                        $body = "URL/Image ...";
                                                } else {
-                                                       $body = BBCode::convert($body, false, 2, true);
+                                                       $body = BBCode::convert($body, false, BBCode::API, true);
                                                        $body = HTML::toPlaintext($body, 0);
                                                        $body = ((strlen($body) > 137) ? substr($body, 0, 137) . "..." : $body);
                                                }