From 647823769b3fca7f35024979909985ea8708aa31 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 20 Nov 2020 08:55:29 -0500 Subject: [PATCH 1/2] [twitter] Simplify remote self check - Adresses https://github.com/friendica/friendica/issues/9252#issuecomment-730851818 --- twitter/twitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twitter/twitter.php b/twitter/twitter.php index f70aa141b..4066bdec3 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1919,7 +1919,7 @@ function twitter_fetchhometimeline(App $a, $uid) $notify = false; - if (($postarray['uri'] == $postarray['thr-parent']) && ($postarray['author-link'] == $postarray['owner-link'])) { + if (empty($postarray['thr-parent'])) { $contact = DBA::selectFirst('contact', [], ['id' => $postarray['contact-id'], 'self' => false]); if (DBA::isResult($contact)) { $notify = Item::isRemoteSelf($contact, $postarray); From 8be4e72cdd028f30ed59bad1b55aaf6e3d1b4c7d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 20 Nov 2020 09:11:49 -0500 Subject: [PATCH 2/2] [wppost] Add fallback values for checkboxes - Addresses https://github.com/friendica/friendica/issues/9252#issuecomment-725744557 - Fix some of the formatting according to code standards --- wppost/wppost.php | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/wppost/wppost.php b/wppost/wppost.php index aac81967b..f9caf2328 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -44,7 +44,7 @@ function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) } -function wppost_settings(&$a,&$s) { +function wppost_settings(&$a, &$s) { if(! local_user()) return; @@ -84,8 +84,9 @@ function wppost_settings(&$a,&$s) { $s .= '

'. DI::l10n()->t('Wordpress Export').'

'; $s .= ''; $s .= '
'; - $s .= ''; - $s .= ''; + $s .= ''; + $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; @@ -105,11 +106,13 @@ function wppost_settings(&$a,&$s) { $s .= '
'; $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; $s .= '
'; $s .= '
'; @@ -119,6 +122,7 @@ function wppost_settings(&$a,&$s) { $s .= '
'; $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; @@ -129,22 +133,20 @@ function wppost_settings(&$a,&$s) { } -function wppost_settings_post(&$a,&$b) { - +function wppost_settings_post(&$a, &$b) +{ if(!empty($_POST['wppost-submit'])) { - DI::pConfig()->set(local_user(),'wppost','post',intval($_POST['wppost'])); - DI::pConfig()->set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault'] ?? false)); - DI::pConfig()->set(local_user(),'wppost','wp_username',trim($_POST['wp_username'])); - DI::pConfig()->set(local_user(),'wppost','wp_password',trim($_POST['wp_password'])); - DI::pConfig()->set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog'])); - DI::pConfig()->set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'] ?? '')); - DI::pConfig()->set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck'])); - $wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text'])); - $wp_backlink_text = BBCode::convert($wp_backlink_text, false, BBCode::BACKLINK); + DI::pConfig()->set(local_user(), 'wppost', 'post' , intval($_POST['wppost'])); + DI::pConfig()->set(local_user(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault'])); + DI::pConfig()->set(local_user(), 'wppost', 'wp_username' , trim($_POST['wp_username'])); + DI::pConfig()->set(local_user(), 'wppost', 'wp_password' , trim($_POST['wp_password'])); + DI::pConfig()->set(local_user(), 'wppost', 'wp_blog' , trim($_POST['wp_blog'])); + DI::pConfig()->set(local_user(), 'wppost', 'backlink' , intval($_POST['wp_backlink'])); + DI::pConfig()->set(local_user(), 'wppost', 'shortcheck' , intval($_POST['wp_shortcheck'])); + $wp_backlink_text = BBCode::convert(trim($_POST['wp_backlink_text']), false, BBCode::BACKLINK); $wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true); - DI::pConfig()->set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text); + DI::pConfig()->set(local_user(), 'wppost', 'wp_backlink_text', $wp_backlink_text); } - } function wppost_hook_fork(&$a, &$b) @@ -178,11 +180,11 @@ function wppost_post_local(&$a, &$b) { return; } - $wp_post = intval(DI::pConfig()->get(local_user(),'wppost','post')); + $wp_post = intval(DI::pConfig()->get(local_user(), 'wppost', 'post')); $wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0); - if ($b['api_source'] && intval(DI::pConfig()->get(local_user(),'wppost','post_by_default'))) { + if ($b['api_source'] && intval(DI::pConfig()->get(local_user(), 'wppost', 'post_by_default'))) { $wp_enable = 1; } @@ -270,7 +272,7 @@ function wppost_send(&$a, &$b) // If no bookmark is found then take the first line if ($wptitle == '') { // Remove the share element before fetching the first line - $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body'])); + $title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism", "\n$1\n", $b['body'])); $title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n"; $pos = strpos($title, "\n"); @@ -288,8 +290,8 @@ function wppost_send(&$a, &$b) $post = BBCode::convert($b['body'], false, BBCode::CONNECTORS); // If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it - $post = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$post); - $post = preg_replace('/(.*?)<\/a>/ism',"\n$1\n",$post); + $post = preg_replace('/(.*?)<\/a>/ism', "\n$1\n", $post); + $post = preg_replace('/(.*?)<\/a>/ism', "\n$1\n", $post); $post = $title.$post;