Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Tests[ListChannelsDefault, ListChannelsOwned, ListChannelsSubscribedAny, ListChannelsAllAny, ListChannelsSubscribed, ListChannelsAll]

Browse Source
This commit is contained in:
Mike Schwörer
2022-12-22 17:29:59 +01:00
parent 984470b47d
commit 56d9f977ae
9 changed files with 115 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scnserver/db/channels.go
View File

@@ -175,11 +175,11 @@ func (db *Database) ListChannelsByAccess(ctx TxContext, userid models.UserID, co
return nil, err
}
confCond := ""
confCond := "OR (sub.subscription_id IS NOT NULL)"
if confirmed != nil && *confirmed {
confCond = "OR sub.confirmed = 1"
confCond = "OR (sub.subscription_id IS NOT NULL AND sub.confirmed = 1)"
} else if confirmed != nil && !*confirmed {
confCond = "OR sub.confirmed = 0"
confCond = "OR (sub.subscription_id IS NOT NULL AND sub.confirmed = 0)"
}
rows, err := tx.Query(ctx, "SELECT channels.*, sub.* FROM channels LEFT JOIN subscriptions AS sub on channels.channel_id = sub.channel_id AND sub.subscriber_user_id = :subuid WHERE owner_user_id = :ouid "+confCond, sq.PP{