Improved handling of native quotes #12076
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MrPetovan
requested changes
Oct 29, 2022
src/Content/Item.php
Outdated
Comment on lines
751
to
752
| $link = $post['plink'] ?: $post['uri']; | ||
| $body .= "\n♲ " . $link; |
There was a problem hiding this comment.
Energy is expensive, let's save the creation of an intermediary variable.
Suggested change
| $link = $post['plink'] ?: $post['uri']; | |
| $body .= "\n♲ " . $link; | |
| $body .= "\n♲ " . ($post['plink'] ?: $post['uri']); |
src/Model/Item.php
Outdated
Comment on lines
3661
to
3699
| if (!empty($shared['guid'])) { | ||
| $shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]); | ||
| if (!empty($shared_item['uri-id'])) { | ||
| Logger::debug('Found post by guid', ['guid' => $shared['guid'], 'uid' => $uid]); | ||
| } | ||
| } | ||
|
|
||
| if (empty($shared_item['uri-id']) && !empty($shared['message_id'])) { | ||
| $shared_item = Post::selectFirst(['uri-id'], ['uri' => $shared['message_id'], 'uid' => [0, $uid]]); | ||
| if (!empty($shared_item['uri-id'])) { | ||
| Logger::debug('Found post by message_id', ['message_id' => $shared['message_id'], 'uid' => $uid]); | ||
| } | ||
| } | ||
|
|
||
| if (empty($shared_item['uri-id']) && !empty($shared['link'])) { | ||
| $shared_item = Post::selectFirst(['uri-id'], ['plink' => $shared['link'], 'uid' => [0, $uid]]); | ||
| if (!empty($shared_item['uri-id'])) { | ||
| Logger::debug('Found post by link', ['link' => $shared['link'], 'uid' => $uid]); | ||
| } | ||
| } | ||
|
|
||
| if (empty($shared_item['uri-id'])) { | ||
| $url = $shared['message_id'] ?: $shared['link']; | ||
| $id = self::fetchByLink($url); | ||
| if (!$id) { | ||
| Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid]); | ||
| return 0; | ||
| } | ||
|
|
||
| Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); | ||
|
|
||
| $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]); | ||
| if (!DBA::isResult($shared_item)) { | ||
| Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]); | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| return $shared_item['uri-id']; |
There was a problem hiding this comment.
I'd rather we used early returns than the repetitive empty($shared_item['uri-id']) condition which means something different every time.
Suggested change
| if (!empty($shared['guid'])) { | |
| $shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]); | |
| if (!empty($shared_item['uri-id'])) { | |
| Logger::debug('Found post by guid', ['guid' => $shared['guid'], 'uid' => $uid]); | |
| } | |
| } | |
| if (empty($shared_item['uri-id']) && !empty($shared['message_id'])) { | |
| $shared_item = Post::selectFirst(['uri-id'], ['uri' => $shared['message_id'], 'uid' => [0, $uid]]); | |
| if (!empty($shared_item['uri-id'])) { | |
| Logger::debug('Found post by message_id', ['message_id' => $shared['message_id'], 'uid' => $uid]); | |
| } | |
| } | |
| if (empty($shared_item['uri-id']) && !empty($shared['link'])) { | |
| $shared_item = Post::selectFirst(['uri-id'], ['plink' => $shared['link'], 'uid' => [0, $uid]]); | |
| if (!empty($shared_item['uri-id'])) { | |
| Logger::debug('Found post by link', ['link' => $shared['link'], 'uid' => $uid]); | |
| } | |
| } | |
| if (empty($shared_item['uri-id'])) { | |
| $url = $shared['message_id'] ?: $shared['link']; | |
| $id = self::fetchByLink($url); | |
| if (!$id) { | |
| Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid]); | |
| return 0; | |
| } | |
| Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]); | |
| if (!DBA::isResult($shared_item)) { | |
| Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| return 0; | |
| } | |
| } | |
| return $shared_item['uri-id']; | |
| if (!empty($shared['guid'])) { | |
| $shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]); | |
| if (!empty($shared_item['uri-id'])) { | |
| Logger::debug('Found post by guid', ['guid' => $shared['guid'], 'uid' => $uid]); | |
| return $shared_item['uri-id']; | |
| } | |
| } | |
| if (!empty($shared['message_id'])) { | |
| $shared_item = Post::selectFirst(['uri-id'], ['uri' => $shared['message_id'], 'uid' => [0, $uid]]); | |
| if (!empty($shared_item['uri-id'])) { | |
| Logger::debug('Found post by message_id', ['message_id' => $shared['message_id'], 'uid' => $uid]); | |
| return $shared_item['uri-id']; | |
| } | |
| } | |
| if (!empty($shared['link'])) { | |
| $shared_item = Post::selectFirst(['uri-id'], ['plink' => $shared['link'], 'uid' => [0, $uid]]); | |
| if (!empty($shared_item['uri-id'])) { | |
| Logger::debug('Found post by link', ['link' => $shared['link'], 'uid' => $uid]); | |
| return $shared_item['uri-id']; | |
| } | |
| } | |
| $url = $shared['message_id'] ?: $shared['link']; | |
| $id = self::fetchByLink($url); | |
| if (!$id) { | |
| Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid]); | |
| return 0; | |
| } | |
| Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]); | |
| if (!DBA::isResult($shared_item)) { | |
| Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| return 0; | |
| } | |
| return $shared_item['uri-id']; |
|
@MrPetovan changes are applied. |
MrPetovan
requested changes
Oct 29, 2022
src/Model/Item.php
Outdated
Comment on lines
3693
to
3700
| if (!DBA::isResult($shared_item)) { | ||
| Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]); | ||
| return 0; | ||
| } else { | ||
| Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); | ||
| } | ||
|
|
||
| return $shared_item['uri-id']; |
There was a problem hiding this comment.
Almost there, no need for an else statement here and we can avoid a negative condition.
Suggested change
| if (!DBA::isResult($shared_item)) { | |
| Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| return 0; | |
| } else { | |
| Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| } | |
| return $shared_item['uri-id']; | |
| if (DBA::isResult($shared_item)) { | |
| Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| return $shared_item['uri-id']; | |
| } | |
| Logger::warning('Post does not exist.', ['id' => $id, 'url' => $url, 'uid' => $uid]); | |
| return 0; |
|
Does this fix #12073 ? |
|
Yeah |
|
Did you see my second Change Request? |
MrPetovan
approved these changes
Oct 30, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We are now only storing non native quotes in the body. All native quotes are done via the quote-uri-id field in the post. The whole code is cleaned up around this.
This PR has to be merged at the same time as the addon PR.