mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-21 23:56:33 +02:00
Code Issues Releases Wiki Activity

Database changes (#18)

Browse Source 
* Update core references

* Update core attribute names
This commit is contained in:
Toby Zerner
2018-09-17 04:20:44 +09:30
committed by Franz Liedke
parent 63ff4b7fc7
commit 3e09c2bf33
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/subscriptions/src/Gambit/SubscriptionGambit.php
View File

@@ -32,7 +32,7 @@ class SubscriptionGambit extends AbstractRegexGambit
$method = $negate ? 'whereNotExists' : 'whereExists';
$search->getQuery()->$method(function ($query) use ($actor, $matches) {
$query->selectRaw('1')
->from('users_discussions')
->from('discussion_user')
->whereColumn('discussions.id', 'discussion_id')
->where('user_id', $actor->id)
->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore');

2
extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
View File

@@ -45,7 +45,7 @@ class FilterDiscussionListBySubscription
$actor = $event->search->getActor();
$event->search->getQuery()->whereNotExists(function ($query) use ($actor) {
$query->selectRaw(1)
->from('users_discussions')
->from('discussion_user')
->whereColumn('discussions.id', 'discussion_id')
->where('user_id', $actor->id)
->where('subscription', 'ignore');

4
extensions/subscriptions/src/Listener/SendNotificationWhenReplyIsPosted.php
View File

@@ -68,8 +68,8 @@ class SendNotificationWhenReplyIsPosted
$notify = $discussion->readers()
->where('users.id', '!=', $post->user_id)
->where('users_discussions.subscription', 'follow')
->where('users_discussions.read_number', $discussion->last_post_number - 1)
->where('discussion_user.subscription', 'follow')
->where('discussion_user.last_read_post_number', $discussion->last_post_number - 1)
->get();
$this->notifications->sync(

2
extensions/subscriptions/src/Notification/NewPostBlueprint.php
View File

@@ -42,7 +42,7 @@ class NewPostBlueprint implements BlueprintInterface, MailableInterface
/**
* {@inheritdoc}
*/
public function getSender()
public function getFromUser()
{
return $this->post->user;
}