Skip to content
Snippets Groups Projects
Commit 2019d65d authored by Jason Salyers's avatar Jason Salyers
Browse files

[JES] More updates to muting. Adding is_muted to the raw posts returned from... 

[JES] More updates to muting. Adding is_muted to the raw posts returned from the database to make it easier to determine which posts were muted by mods/admins
parent fbf3a90d
No related branches found
No related tags found
2 merge requests!456Release candidate v1 24,!370Jsalyers muting at sql level
This commit is part of merge request !370. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 59 deletions
hive/db/sql_scripts/bridge_get_account_posts_by_blog.sql
+ 2
− 1
View file @ 2019d65d
...@@ -58,7 +58,8 @@ BEGIN ...@@ -58,7 +58,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM hive_posts_view hp FROM hive_posts_view hp
JOIN JOIN
( (
......
hive/db/sql_scripts/bridge_get_account_posts_by_comments.sql
+ 2
− 1
View file @ 2019d65d
...@@ -46,7 +46,8 @@ BEGIN ...@@ -46,7 +46,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT hp1.id SELECT hp1.id
......
hive/db/sql_scripts/bridge_get_account_posts_by_payout.sql
+ 2
− 1
View file @ 2019d65d
...@@ -50,7 +50,8 @@ BEGIN ...@@ -50,7 +50,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
WHERE WHERE
......
hive/db/sql_scripts/bridge_get_account_posts_by_posts.sql
+ 2
− 1
View file @ 2019d65d
...@@ -46,7 +46,8 @@ BEGIN ...@@ -46,7 +46,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
WHERE WHERE
......
hive/db/sql_scripts/bridge_get_account_posts_by_replies.sql
+ 2
− 1
View file @ 2019d65d
...@@ -46,7 +46,8 @@ BEGIN ...@@ -46,7 +46,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
......
hive/db/sql_scripts/bridge_get_post.sql
+ 2
− 1
View file @ 2019d65d
...@@ -44,7 +44,8 @@ BEGIN ...@@ -44,7 +44,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
WHERE WHERE
......
hive/db/sql_scripts/bridge_get_ranked_post_for_all.sql
+ 14
− 7
View file @ 2019d65d
...@@ -43,7 +43,8 @@ BEGIN ...@@ -43,7 +43,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -110,7 +111,8 @@ BEGIN ...@@ -110,7 +111,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -179,7 +181,8 @@ BEGIN ...@@ -179,7 +181,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -249,7 +252,8 @@ BEGIN ...@@ -249,7 +252,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -320,7 +324,8 @@ BEGIN ...@@ -320,7 +324,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -390,7 +395,8 @@ BEGIN ...@@ -390,7 +395,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -459,7 +465,8 @@ BEGIN ...@@ -459,7 +465,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
......
hive/db/sql_scripts/bridge_get_ranked_post_for_communities.sql
+ 16
− 8
View file @ 2019d65d
...@@ -39,7 +39,8 @@ $function$ ...@@ -39,7 +39,8 @@ $function$
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
JOIN hive_communities hc ON hc.id = hp.community_id JOIN hive_communities hc ON hc.id = hp.community_id
...@@ -98,7 +99,8 @@ BEGIN ...@@ -98,7 +99,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -169,7 +171,8 @@ BEGIN ...@@ -169,7 +171,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -241,7 +244,8 @@ BEGIN ...@@ -241,7 +244,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -311,7 +315,8 @@ BEGIN ...@@ -311,7 +315,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -381,7 +386,8 @@ BEGIN ...@@ -381,7 +386,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -452,7 +458,8 @@ BEGIN ...@@ -452,7 +458,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -518,7 +525,8 @@ BEGIN ...@@ -518,7 +525,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
......
hive/db/sql_scripts/bridge_get_ranked_post_for_observer_communities.sql
+ 14
− 7
View file @ 2019d65d
...@@ -45,7 +45,8 @@ BEGIN ...@@ -45,7 +45,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
JOIN hive_subscriptions hs ON hp.community_id = hs.community_id JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
...@@ -109,7 +110,8 @@ BEGIN ...@@ -109,7 +110,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
JOIN hive_subscriptions hs ON hp.community_id = hs.community_id JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
...@@ -173,7 +175,8 @@ BEGIN ...@@ -173,7 +175,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -248,7 +251,8 @@ BEGIN ...@@ -248,7 +251,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
JOIN hive_subscriptions hs ON hp.community_id = hs.community_id JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
...@@ -312,7 +316,8 @@ BEGIN ...@@ -312,7 +316,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
JOIN hive_subscriptions hs ON hp.community_id = hs.community_id JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
...@@ -377,7 +382,8 @@ BEGIN ...@@ -377,7 +382,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -451,7 +457,8 @@ BEGIN ...@@ -451,7 +457,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
hive_posts_view hp hive_posts_view hp
JOIN hive_subscriptions hs ON hp.community_id = hs.community_id JOIN hive_subscriptions hs ON hp.community_id = hs.community_id
......
hive/db/sql_scripts/bridge_get_ranked_post_for_tag.sql
+ 14
− 7
View file @ 2019d65d
...@@ -45,7 +45,8 @@ BEGIN ...@@ -45,7 +45,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -117,7 +118,8 @@ BEGIN ...@@ -117,7 +118,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -189,7 +191,8 @@ BEGIN ...@@ -189,7 +191,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -262,7 +265,8 @@ BEGIN ...@@ -262,7 +265,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -335,7 +339,8 @@ BEGIN ...@@ -335,7 +339,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -407,7 +412,8 @@ BEGIN ...@@ -407,7 +412,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
...@@ -479,7 +485,8 @@ BEGIN ...@@ -479,7 +485,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM FROM
( (
SELECT SELECT
......
hive/db/sql_scripts/bridge_get_ranked_post_type.sql
+ 2
− 1
View file @ 2019d65d
...@@ -35,7 +35,8 @@ CREATE TYPE bridge_api_post AS ( ...@@ -35,7 +35,8 @@ CREATE TYPE bridge_api_post AS (
community_title VARCHAR, community_title VARCHAR,
role_id SMALLINT, role_id SMALLINT,
is_pinned BOOLEAN, is_pinned BOOLEAN,
curator_payout_value VARCHAR curator_payout_value VARCHAR,
is_muted BOOLEAN
); );
DROP TYPE IF EXISTS bridge_api_post_reblogs CASCADE; DROP TYPE IF EXISTS bridge_api_post_reblogs CASCADE;
......
hive/db/sql_scripts/condenser_get_by_account_comments.sql
+ 2
− 1
View file @ 2019d65d
...@@ -52,7 +52,8 @@ BEGIN ...@@ -52,7 +52,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM hive_posts_view hp FROM hive_posts_view hp
WHERE ( hp.author = _author ) AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) AND hp.depth > 0 WHERE ( hp.author = _author ) AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) AND hp.depth > 0
ORDER BY hp.id DESC ORDER BY hp.id DESC
......
hive/db/sql_scripts/condenser_get_by_blog.sql
+ 2
− 1
View file @ 2019d65d
...@@ -62,7 +62,8 @@ BEGIN ...@@ -62,7 +62,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM hive_posts_view hp FROM hive_posts_view hp
JOIN hive_feed_cache hfc ON hp.id = hfc.post_id JOIN hive_feed_cache hfc ON hp.id = hfc.post_id
WHERE hfc.account_id = __account_id AND ( ( __post_id = 0 ) OR ( hfc.created_at <= __created_at ) ) WHERE hfc.account_id = __account_id AND ( ( __post_id = 0 ) OR ( hfc.created_at <= __created_at ) )
......
hive/db/sql_scripts/condenser_get_by_blog_without_reblog.sql
+ 2
− 1
View file @ 2019d65d
...@@ -52,7 +52,8 @@ BEGIN ...@@ -52,7 +52,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM hive_posts_view hp FROM hive_posts_view hp
WHERE ( hp.author = _author ) AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) AND hp.depth = 0 WHERE ( hp.author = _author ) AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) AND hp.depth = 0
ORDER BY hp.id DESC ORDER BY hp.id DESC
......
hive/db/sql_scripts/condenser_get_by_replies_to_account.sql
+ 2
− 1
View file @ 2019d65d
...@@ -62,7 +62,8 @@ BEGIN ...@@ -62,7 +62,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM hive_posts_view hp FROM hive_posts_view hp
JOIN JOIN
( (
......
hive/db/sql_scripts/condenser_get_discussions_by_comments.sql
+ 2
− 1
View file @ 2019d65d
...@@ -52,7 +52,8 @@ BEGIN ...@@ -52,7 +52,8 @@ BEGIN
hp.community_title, hp.community_title,
hp.role_id, hp.role_id,
hp.is_pinned, hp.is_pinned,
hp.curator_payout_value hp.curator_payout_value,
hp.is_muted
FROM hive_posts_view hp FROM hive_posts_view hp
WHERE WHERE
hp.author = _author AND hp.depth > 0 AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) ) hp.author = _author AND hp.depth > 0 AND ( ( __post_id = 0 ) OR ( hp.id <= __post_id ) )
......
hive/server/bridge_api/objects.py
+ 15
− 18
View file @ 2019d65d
...@@ -15,21 +15,19 @@ log = logging.getLogger(__name__) ...@@ -15,21 +15,19 @@ log = logging.getLogger(__name__)
# pylint: disable=too-many-lines # pylint: disable=too-many-lines
def append_statistics_to_post(post, row, is_pinned, blacklists_for_user=None, override_gray=False): def append_statistics_to_post(post, row, is_pinned, blacklists_for_user=[], override_gray=False):
""" apply information such as blacklists and community names/roles to a given post """ """ apply information such as blacklists and community names/roles to a given post """
if not blacklists_for_user:
post['blacklists'] = Mutes.lists(row['author'], row['author_rep']) post['blacklists'] = []
else: if row['author'] in blacklists_for_user:
post['blacklists'] = [] blacklists = blacklists_for_user[row['author']]
if row['author'] in blacklists_for_user: for blacklist in blacklists:
blacklists = blacklists_for_user[row['author']] post['blacklists'].append(blacklist)
for blacklist in blacklists: reputation = row['author_rep']
post['blacklists'].append(blacklist) if reputation < 1:
reputation = row['author_rep'] post['blacklists'].append('reputation-0')
if reputation < 1: elif reputation == 1:
post['blacklists'].append('reputation-0') post['blacklists'].append('reputation-1')
elif reputation == 1:
post['blacklists'].append('reputation-1')
if 'community_title' in row and row['community_title']: if 'community_title' in row and row['community_title']:
post['community'] = row['category'] post['community'] = row['category']
...@@ -40,11 +38,10 @@ def append_statistics_to_post(post, row, is_pinned, blacklists_for_user=None, ov ...@@ -40,11 +38,10 @@ def append_statistics_to_post(post, row, is_pinned, blacklists_for_user=None, ov
else: else:
post['author_role'] = 'guest' post['author_role'] = 'guest'
post['author_title'] = '' post['author_title'] = ''
elif override_gray:
post['stats']['gray'] = ('irredeemables' in post['blacklists'] or len(post['blacklists']) >= 2)
else:
post['stats']['gray'] = row['is_grayed']
post['stats']['gray'] = row['is_grayed']
if 'is_muted' in row and row['is_muted']:
post['stats']['gray'] = True
post['stats']['hide'] = 'irredeemables' in post['blacklists'] post['stats']['hide'] = 'irredeemables' in post['blacklists']
# it overrides 'is_hidden' flag from post, is that the intent? # it overrides 'is_hidden' flag from post, is that the intent?
if is_pinned: if is_pinned:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment